@@ -518,15 +518,15 @@ higher v0.0.1 ([ROOT]/foo)
518
518
#[ cargo_test( nightly, reason = "edition2024 in rustc is unstable" ) ]
519
519
fn resolve_edition2024 ( ) {
520
520
Package :: new ( "only-newer" , "1.6.0" )
521
- . rust_version ( "1.65 .0" )
521
+ . rust_version ( "1.90 .0" )
522
522
. file ( "src/lib.rs" , "fn other_stuff() {}" )
523
523
. publish ( ) ;
524
524
Package :: new ( "newer-and-older" , "1.5.0" )
525
- . rust_version ( "1.55 .0" )
525
+ . rust_version ( "1.80 .0" )
526
526
. file ( "src/lib.rs" , "fn other_stuff() {}" )
527
527
. publish ( ) ;
528
528
Package :: new ( "newer-and-older" , "1.6.0" )
529
- . rust_version ( "1.65 .0" )
529
+ . rust_version ( "1.90 .0" )
530
530
. file ( "src/lib.rs" , "fn other_stuff() {}" )
531
531
. publish ( ) ;
532
532
@@ -541,7 +541,7 @@ fn resolve_edition2024() {
541
541
version = "0.0.1"
542
542
edition = "2024"
543
543
authors = []
544
- rust-version = "1.60 .0"
544
+ rust-version = "1.85 .0"
545
545
546
546
[dependencies]
547
547
only-newer = "1.0.0"
@@ -556,9 +556,9 @@ fn resolve_edition2024() {
556
556
. masquerade_as_nightly_cargo ( & [ "edition2024" ] )
557
557
. with_stderr_data ( str![ [ r#"
558
558
[UPDATING] `dummy-registry` index
559
- [LOCKING] 2 packages to latest Rust 1.60 .0 compatible versions
560
- [ADDING] newer-and-older v1.5.0 (available: v1.6.0, requires Rust 1.65 .0)
561
- [ADDING] only-newer v1.6.0 (requires Rust 1.65 .0)
559
+ [LOCKING] 2 packages to latest Rust 1.85 .0 compatible versions
560
+ [ADDING] newer-and-older v1.5.0 (available: v1.6.0, requires Rust 1.90 .0)
561
+ [ADDING] only-newer v1.6.0 (requires Rust 1.90 .0)
562
562
563
563
"# ] ] )
564
564
. run ( ) ;
@@ -577,6 +577,8 @@ foo v0.0.1 ([ROOT]/foo)
577
577
. with_stderr_data ( str![ [ r#"
578
578
[UPDATING] `dummy-registry` index
579
579
[LOCKING] 2 packages to latest compatible versions
580
+ [ADDING] newer-and-older v1.6.0 (requires Rust 1.90.0)
581
+ [ADDING] only-newer v1.6.0 (requires Rust 1.90.0)
580
582
581
583
"# ] ] )
582
584
. masquerade_as_nightly_cargo ( & [ "edition2024" ] )
@@ -597,6 +599,8 @@ foo v0.0.1 ([ROOT]/foo)
597
599
. with_stderr_data ( str![ [ r#"
598
600
[UPDATING] `dummy-registry` index
599
601
[LOCKING] 2 packages to latest compatible versions
602
+ [ADDING] newer-and-older v1.6.0 (requires Rust 1.90.0)
603
+ [ADDING] only-newer v1.6.0 (requires Rust 1.90.0)
600
604
601
605
"# ] ] )
602
606
. masquerade_as_nightly_cargo ( & [ "edition2024" ] )
@@ -615,15 +619,15 @@ foo v0.0.1 ([ROOT]/foo)
615
619
#[ cargo_test]
616
620
fn resolve_v3 ( ) {
617
621
Package :: new ( "only-newer" , "1.6.0" )
618
- . rust_version ( "1.65 .0" )
622
+ . rust_version ( "1.90 .0" )
619
623
. file ( "src/lib.rs" , "fn other_stuff() {}" )
620
624
. publish ( ) ;
621
625
Package :: new ( "newer-and-older" , "1.5.0" )
622
- . rust_version ( "1.55 .0" )
626
+ . rust_version ( "1.80 .0" )
623
627
. file ( "src/lib.rs" , "fn other_stuff() {}" )
624
628
. publish ( ) ;
625
629
Package :: new ( "newer-and-older" , "1.6.0" )
626
- . rust_version ( "1.65 .0" )
630
+ . rust_version ( "1.90 .0" )
627
631
. file ( "src/lib.rs" , "fn other_stuff() {}" )
628
632
. publish ( ) ;
629
633
@@ -636,7 +640,7 @@ fn resolve_v3() {
636
640
version = "0.0.1"
637
641
edition = "2015"
638
642
authors = []
639
- rust-version = "1.60 .0"
643
+ rust-version = "1.85 .0"
640
644
resolver = "3"
641
645
642
646
[dependencies]
@@ -651,9 +655,9 @@ fn resolve_v3() {
651
655
p. cargo ( "generate-lockfile" )
652
656
. with_stderr_data ( str![ [ r#"
653
657
[UPDATING] `dummy-registry` index
654
- [LOCKING] 2 packages to latest Rust 1.60 .0 compatible versions
655
- [ADDING] newer-and-older v1.5.0 (available: v1.6.0, requires Rust 1.65 .0)
656
- [ADDING] only-newer v1.6.0 (requires Rust 1.65 .0)
658
+ [LOCKING] 2 packages to latest Rust 1.85 .0 compatible versions
659
+ [ADDING] newer-and-older v1.5.0 (available: v1.6.0, requires Rust 1.90 .0)
660
+ [ADDING] only-newer v1.6.0 (requires Rust 1.90 .0)
657
661
658
662
"# ] ] )
659
663
. run ( ) ;
@@ -671,6 +675,8 @@ foo v0.0.1 ([ROOT]/foo)
671
675
. with_stderr_data ( str![ [ r#"
672
676
[UPDATING] `dummy-registry` index
673
677
[LOCKING] 2 packages to latest compatible versions
678
+ [ADDING] newer-and-older v1.6.0 (requires Rust 1.90.0)
679
+ [ADDING] only-newer v1.6.0 (requires Rust 1.90.0)
674
680
675
681
"# ] ] )
676
682
. run ( ) ;
@@ -689,6 +695,8 @@ foo v0.0.1 ([ROOT]/foo)
689
695
. with_stderr_data ( str![ [ r#"
690
696
[UPDATING] `dummy-registry` index
691
697
[LOCKING] 2 packages to latest compatible versions
698
+ [ADDING] newer-and-older v1.6.0 (requires Rust 1.90.0)
699
+ [ADDING] only-newer v1.6.0 (requires Rust 1.90.0)
692
700
693
701
"# ] ] )
694
702
. run ( ) ;
@@ -961,45 +969,6 @@ fn cargo_install_ignores_resolver_v3_msrv_change() {
961
969
. run ( ) ;
962
970
}
963
971
964
- #[ cargo_test( nightly, reason = "edition2024 in rustc is unstable" ) ]
965
- fn cargo_install_ignores_edition_2024_msrv_change ( ) {
966
- Package :: new ( "dep" , "1.0.0" )
967
- . rust_version ( "1.50" )
968
- . file ( "src/lib.rs" , "fn hello() {}" )
969
- . publish ( ) ;
970
- Package :: new ( "dep" , "1.1.0" )
971
- . rust_version ( "1.70" )
972
- . file ( "src/lib.rs" , "fn hello() {}" )
973
- . publish ( ) ;
974
- Package :: new ( "foo" , "0.0.1" )
975
- . rust_version ( "1.60" )
976
- . cargo_feature ( "edition2024" )
977
- . edition ( "2024" )
978
- . file ( "src/main.rs" , "fn main() {}" )
979
- . dep ( "dep" , "1" )
980
- . publish ( ) ;
981
-
982
- cargo_process ( "install foo" )
983
- . masquerade_as_nightly_cargo ( & [ "edition2024" ] )
984
- . with_stderr_data ( str![ [ r#"
985
- [UPDATING] `dummy-registry` index
986
- [DOWNLOADING] crates ...
987
- [DOWNLOADED] foo v0.0.1 (registry `dummy-registry`)
988
- [INSTALLING] foo v0.0.1
989
- [LOCKING] 1 package to latest compatible version
990
- [DOWNLOADING] crates ...
991
- [DOWNLOADED] dep v1.1.0 (registry `dummy-registry`)
992
- [COMPILING] dep v1.1.0
993
- [COMPILING] foo v0.0.1
994
- [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s
995
- [INSTALLING] [ROOT]/home/.cargo/bin/foo[EXE]
996
- [INSTALLED] package `foo v0.0.1` (executable `foo[EXE]`)
997
- [WARNING] be sure to add `[ROOT]/home/.cargo/bin` to your PATH to be able to run the installed binaries
998
-
999
- "# ] ] )
1000
- . run ( ) ;
1001
- }
1002
-
1003
972
#[ cargo_test]
1004
973
fn report_rust_versions ( ) {
1005
974
Package :: new ( "dep-only-low-compatible" , "1.55.0" )
0 commit comments