Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions tests/testsuite/rust_version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -518,15 +518,15 @@ higher v0.0.1 ([ROOT]/foo)
#[cargo_test]
fn resolve_edition2024() {
Package::new("only-newer", "1.6.0")
.rust_version("1.90.0")
.rust_version("1.999.0")
.file("src/lib.rs", "fn other_stuff() {}")
.publish();
Package::new("newer-and-older", "1.5.0")
.rust_version("1.80.0")
.file("src/lib.rs", "fn other_stuff() {}")
.publish();
Package::new("newer-and-older", "1.6.0")
.rust_version("1.90.0")
.rust_version("1.999.0")
.file("src/lib.rs", "fn other_stuff() {}")
.publish();

Expand Down Expand Up @@ -554,8 +554,8 @@ fn resolve_edition2024() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest Rust 1.85.0 compatible versions
[ADDING] newer-and-older v1.5.0 (available: v1.6.0, requires Rust 1.90.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.90.0)
[ADDING] newer-and-older v1.5.0 (available: v1.6.0, requires Rust 1.999.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.999.0)

"#]])
.run();
Expand All @@ -573,8 +573,8 @@ foo v0.0.1 ([ROOT]/foo)
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest compatible versions
[ADDING] newer-and-older v1.6.0 (requires Rust 1.90.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.90.0)
[ADDING] newer-and-older v1.6.0 (requires Rust 1.999.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.999.0)

"#]])
.run();
Expand All @@ -593,8 +593,8 @@ foo v0.0.1 ([ROOT]/foo)
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest compatible versions
[ADDING] newer-and-older v1.6.0 (requires Rust 1.90.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.90.0)
[ADDING] newer-and-older v1.6.0 (requires Rust 1.999.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.999.0)

"#]])
.run();
Expand All @@ -611,15 +611,15 @@ foo v0.0.1 ([ROOT]/foo)
#[cargo_test]
fn resolve_v3() {
Package::new("only-newer", "1.6.0")
.rust_version("1.90.0")
.rust_version("1.999.0")
.file("src/lib.rs", "fn other_stuff() {}")
.publish();
Package::new("newer-and-older", "1.5.0")
.rust_version("1.80.0")
.file("src/lib.rs", "fn other_stuff() {}")
.publish();
Package::new("newer-and-older", "1.6.0")
.rust_version("1.90.0")
.rust_version("1.999.0")
.file("src/lib.rs", "fn other_stuff() {}")
.publish();

Expand Down Expand Up @@ -648,8 +648,8 @@ fn resolve_v3() {
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest Rust 1.85.0 compatible versions
[ADDING] newer-and-older v1.5.0 (available: v1.6.0, requires Rust 1.90.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.90.0)
[ADDING] newer-and-older v1.5.0 (available: v1.6.0, requires Rust 1.999.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.999.0)

"#]])
.run();
Expand All @@ -667,8 +667,8 @@ foo v0.0.1 ([ROOT]/foo)
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest compatible versions
[ADDING] newer-and-older v1.6.0 (requires Rust 1.90.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.90.0)
[ADDING] newer-and-older v1.6.0 (requires Rust 1.999.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.999.0)

"#]])
.run();
Expand All @@ -687,8 +687,8 @@ foo v0.0.1 ([ROOT]/foo)
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest compatible versions
[ADDING] newer-and-older v1.6.0 (requires Rust 1.90.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.90.0)
[ADDING] newer-and-older v1.6.0 (requires Rust 1.999.0)
[ADDING] only-newer v1.6.0 (requires Rust 1.999.0)

"#]])
.run();
Expand Down
Loading