Skip to content

Commit 5f9257e

Browse files
borsbors
committed
Auto merge of #14748 - epage:msrv-policy, r=Rustin170506
test: Remove unused msrv-policy ### What does this PR try to resolve? Missed this in #14639 ### How should we test and review this PR? ### Additional information
2 parents e09a5b8 + 51f634b commit 5f9257e

File tree

1 file changed

+14
-28
lines changed

1 file changed

+14
-28
lines changed

‎tests/testsuite/rust_version.rs

+14-28
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,7 @@ fn resolve_edition2024() {
553553

554554
// Edition2024 should resolve for MSRV
555555
p.cargo("generate-lockfile")
556-
.arg("-Zmsrv-policy")
557-
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
556+
.masquerade_as_nightly_cargo(&["edition2024"])
558557
.with_stderr_data(str![[r#"
559558
[UPDATING] `dummy-registry` index
560559
[LOCKING] 2 packages to latest Rust 1.60.0 compatible versions
@@ -564,8 +563,7 @@ fn resolve_edition2024() {
564563
"#]])
565564
.run();
566565
p.cargo("tree")
567-
.arg("-Zmsrv-policy")
568-
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
566+
.masquerade_as_nightly_cargo(&["edition2024"])
569567
.with_stdout_data(str![[r#"
570568
foo v0.0.1 ([ROOT]/foo)
571569
├── newer-and-older v1.5.0
@@ -581,12 +579,10 @@ foo v0.0.1 ([ROOT]/foo)
581579
[LOCKING] 2 packages to latest compatible versions
582580
583581
"#]])
584-
.arg("-Zmsrv-policy")
585-
.masquerade_as_nightly_cargo(&["msrv-policy"])
582+
.masquerade_as_nightly_cargo(&["edition2024"])
586583
.run();
587584
p.cargo("tree")
588-
.arg("-Zmsrv-policy")
589-
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
585+
.masquerade_as_nightly_cargo(&["edition2024"])
590586
.with_stdout_data(str![[r#"
591587
foo v0.0.1 ([ROOT]/foo)
592588
├── newer-and-older v1.6.0
@@ -603,12 +599,10 @@ foo v0.0.1 ([ROOT]/foo)
603599
[LOCKING] 2 packages to latest compatible versions
604600
605601
"#]])
606-
.arg("-Zmsrv-policy")
607-
.masquerade_as_nightly_cargo(&["msrv-policy"])
602+
.masquerade_as_nightly_cargo(&["edition2024"])
608603
.run();
609604
p.cargo("tree")
610-
.arg("-Zmsrv-policy")
611-
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
605+
.masquerade_as_nightly_cargo(&["edition2024"])
612606
.with_stdout_data(str![[r#"
613607
foo v0.0.1 ([ROOT]/foo)
614608
├── newer-and-older v1.6.0
@@ -657,8 +651,7 @@ fn resolve_v3() {
657651

658652
// v3 should resolve for MSRV
659653
p.cargo("generate-lockfile")
660-
.arg("-Zmsrv-policy")
661-
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
654+
.masquerade_as_nightly_cargo(&["edition2024"])
662655
.with_stderr_data(str![[r#"
663656
[UPDATING] `dummy-registry` index
664657
[LOCKING] 2 packages to latest Rust 1.60.0 compatible versions
@@ -668,8 +661,7 @@ fn resolve_v3() {
668661
"#]])
669662
.run();
670663
p.cargo("tree")
671-
.arg("-Zmsrv-policy")
672-
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
664+
.masquerade_as_nightly_cargo(&["edition2024"])
673665
.with_stdout_data(str![[r#"
674666
foo v0.0.1 ([ROOT]/foo)
675667
├── newer-and-older v1.5.0
@@ -685,12 +677,10 @@ foo v0.0.1 ([ROOT]/foo)
685677
[LOCKING] 2 packages to latest compatible versions
686678
687679
"#]])
688-
.arg("-Zmsrv-policy")
689-
.masquerade_as_nightly_cargo(&["msrv-policy"])
680+
.masquerade_as_nightly_cargo(&["edition2024"])
690681
.run();
691682
p.cargo("tree")
692-
.arg("-Zmsrv-policy")
693-
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
683+
.masquerade_as_nightly_cargo(&["edition2024"])
694684
.with_stdout_data(str![[r#"
695685
foo v0.0.1 ([ROOT]/foo)
696686
├── newer-and-older v1.6.0
@@ -707,12 +697,10 @@ foo v0.0.1 ([ROOT]/foo)
707697
[LOCKING] 2 packages to latest compatible versions
708698
709699
"#]])
710-
.arg("-Zmsrv-policy")
711-
.masquerade_as_nightly_cargo(&["msrv-policy"])
700+
.masquerade_as_nightly_cargo(&["edition2024"])
712701
.run();
713702
p.cargo("tree")
714-
.arg("-Zmsrv-policy")
715-
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
703+
.masquerade_as_nightly_cargo(&["edition2024"])
716704
.with_stdout_data(str![[r#"
717705
foo v0.0.1 ([ROOT]/foo)
718706
├── newer-and-older v1.6.0
@@ -977,8 +965,7 @@ fn cargo_install_ignores_resolver_v3_msrv_change() {
977965
.publish();
978966

979967
cargo_process("install foo")
980-
.arg("-Zmsrv-policy")
981-
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
968+
.masquerade_as_nightly_cargo(&["edition2024"])
982969
.with_stderr_data(str![[r#"
983970
[UPDATING] `dummy-registry` index
984971
[DOWNLOADING] crates ...
@@ -1017,8 +1004,7 @@ fn cargo_install_ignores_edition_2024_msrv_change() {
10171004
.publish();
10181005

10191006
cargo_process("install foo")
1020-
.arg("-Zmsrv-policy")
1021-
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
1007+
.masquerade_as_nightly_cargo(&["edition2024"])
10221008
.with_stderr_data(str![[r#"
10231009
[UPDATING] `dummy-registry` index
10241010
[DOWNLOADING] crates ...

0 commit comments

Comments
 (0)