Skip to content

Commit 4832e11

Browse files
authored
test(msrv): use a far future "newer" version (#15693)
Two tests were using `.rust_version("1.90.0")` for a "newer" Rust, but this failed in rust-lang/rust#142792 for the start of the *real* 1.90.0. Let's bump that to 1.999.0 so we won't have to deal with it for a while.
2 parents 0731d17 + d97bf41 commit 4832e11

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

tests/testsuite/rust_version.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -518,15 +518,15 @@ higher v0.0.1 ([ROOT]/foo)
518518
#[cargo_test]
519519
fn resolve_edition2024() {
520520
Package::new("only-newer", "1.6.0")
521-
.rust_version("1.90.0")
521+
.rust_version("1.999.0")
522522
.file("src/lib.rs", "fn other_stuff() {}")
523523
.publish();
524524
Package::new("newer-and-older", "1.5.0")
525525
.rust_version("1.80.0")
526526
.file("src/lib.rs", "fn other_stuff() {}")
527527
.publish();
528528
Package::new("newer-and-older", "1.6.0")
529-
.rust_version("1.90.0")
529+
.rust_version("1.999.0")
530530
.file("src/lib.rs", "fn other_stuff() {}")
531531
.publish();
532532

@@ -554,8 +554,8 @@ fn resolve_edition2024() {
554554
.with_stderr_data(str![[r#"
555555
[UPDATING] `dummy-registry` index
556556
[LOCKING] 2 packages to latest Rust 1.85.0 compatible versions
557-
[ADDING] newer-and-older v1.5.0 (available: v1.6.0, requires Rust 1.90.0)
558-
[ADDING] only-newer v1.6.0 (requires Rust 1.90.0)
557+
[ADDING] newer-and-older v1.5.0 (available: v1.6.0, requires Rust 1.999.0)
558+
[ADDING] only-newer v1.6.0 (requires Rust 1.999.0)
559559
560560
"#]])
561561
.run();
@@ -573,8 +573,8 @@ foo v0.0.1 ([ROOT]/foo)
573573
.with_stderr_data(str![[r#"
574574
[UPDATING] `dummy-registry` index
575575
[LOCKING] 2 packages to latest compatible versions
576-
[ADDING] newer-and-older v1.6.0 (requires Rust 1.90.0)
577-
[ADDING] only-newer v1.6.0 (requires Rust 1.90.0)
576+
[ADDING] newer-and-older v1.6.0 (requires Rust 1.999.0)
577+
[ADDING] only-newer v1.6.0 (requires Rust 1.999.0)
578578
579579
"#]])
580580
.run();
@@ -593,8 +593,8 @@ foo v0.0.1 ([ROOT]/foo)
593593
.with_stderr_data(str![[r#"
594594
[UPDATING] `dummy-registry` index
595595
[LOCKING] 2 packages to latest compatible versions
596-
[ADDING] newer-and-older v1.6.0 (requires Rust 1.90.0)
597-
[ADDING] only-newer v1.6.0 (requires Rust 1.90.0)
596+
[ADDING] newer-and-older v1.6.0 (requires Rust 1.999.0)
597+
[ADDING] only-newer v1.6.0 (requires Rust 1.999.0)
598598
599599
"#]])
600600
.run();
@@ -611,15 +611,15 @@ foo v0.0.1 ([ROOT]/foo)
611611
#[cargo_test]
612612
fn resolve_v3() {
613613
Package::new("only-newer", "1.6.0")
614-
.rust_version("1.90.0")
614+
.rust_version("1.999.0")
615615
.file("src/lib.rs", "fn other_stuff() {}")
616616
.publish();
617617
Package::new("newer-and-older", "1.5.0")
618618
.rust_version("1.80.0")
619619
.file("src/lib.rs", "fn other_stuff() {}")
620620
.publish();
621621
Package::new("newer-and-older", "1.6.0")
622-
.rust_version("1.90.0")
622+
.rust_version("1.999.0")
623623
.file("src/lib.rs", "fn other_stuff() {}")
624624
.publish();
625625

@@ -648,8 +648,8 @@ fn resolve_v3() {
648648
.with_stderr_data(str![[r#"
649649
[UPDATING] `dummy-registry` index
650650
[LOCKING] 2 packages to latest Rust 1.85.0 compatible versions
651-
[ADDING] newer-and-older v1.5.0 (available: v1.6.0, requires Rust 1.90.0)
652-
[ADDING] only-newer v1.6.0 (requires Rust 1.90.0)
651+
[ADDING] newer-and-older v1.5.0 (available: v1.6.0, requires Rust 1.999.0)
652+
[ADDING] only-newer v1.6.0 (requires Rust 1.999.0)
653653
654654
"#]])
655655
.run();
@@ -667,8 +667,8 @@ foo v0.0.1 ([ROOT]/foo)
667667
.with_stderr_data(str![[r#"
668668
[UPDATING] `dummy-registry` index
669669
[LOCKING] 2 packages to latest compatible versions
670-
[ADDING] newer-and-older v1.6.0 (requires Rust 1.90.0)
671-
[ADDING] only-newer v1.6.0 (requires Rust 1.90.0)
670+
[ADDING] newer-and-older v1.6.0 (requires Rust 1.999.0)
671+
[ADDING] only-newer v1.6.0 (requires Rust 1.999.0)
672672
673673
"#]])
674674
.run();
@@ -687,8 +687,8 @@ foo v0.0.1 ([ROOT]/foo)
687687
.with_stderr_data(str![[r#"
688688
[UPDATING] `dummy-registry` index
689689
[LOCKING] 2 packages to latest compatible versions
690-
[ADDING] newer-and-older v1.6.0 (requires Rust 1.90.0)
691-
[ADDING] only-newer v1.6.0 (requires Rust 1.90.0)
690+
[ADDING] newer-and-older v1.6.0 (requires Rust 1.999.0)
691+
[ADDING] only-newer v1.6.0 (requires Rust 1.999.0)
692692
693693
"#]])
694694
.run();

0 commit comments

Comments
 (0)