Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: Remove unused msrv-policy #14748

Merged
merged 1 commit into from
Oct 30, 2024
Merged

test: Remove unused msrv-policy #14748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 14 additions & 28 deletions tests/testsuite/rust_version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,8 +553,7 @@ fn resolve_edition2024() {

// Edition2024 should resolve for MSRV
p.cargo("generate-lockfile")
.arg("-Zmsrv-policy")
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
.masquerade_as_nightly_cargo(&["edition2024"])
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest Rust 1.60.0 compatible versions
Expand All @@ -564,8 +563,7 @@ fn resolve_edition2024() {
"#]])
.run();
p.cargo("tree")
.arg("-Zmsrv-policy")
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
.masquerade_as_nightly_cargo(&["edition2024"])
.with_stdout_data(str![[r#"
foo v0.0.1 ([ROOT]/foo)
├── newer-and-older v1.5.0
Expand All @@ -581,12 +579,10 @@ foo v0.0.1 ([ROOT]/foo)
[LOCKING] 2 packages to latest compatible versions

"#]])
.arg("-Zmsrv-policy")
.masquerade_as_nightly_cargo(&["msrv-policy"])
.masquerade_as_nightly_cargo(&["edition2024"])
.run();
p.cargo("tree")
.arg("-Zmsrv-policy")
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
.masquerade_as_nightly_cargo(&["edition2024"])
.with_stdout_data(str![[r#"
foo v0.0.1 ([ROOT]/foo)
├── newer-and-older v1.6.0
Expand All @@ -603,12 +599,10 @@ foo v0.0.1 ([ROOT]/foo)
[LOCKING] 2 packages to latest compatible versions

"#]])
.arg("-Zmsrv-policy")
.masquerade_as_nightly_cargo(&["msrv-policy"])
.masquerade_as_nightly_cargo(&["edition2024"])
.run();
p.cargo("tree")
.arg("-Zmsrv-policy")
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
.masquerade_as_nightly_cargo(&["edition2024"])
.with_stdout_data(str![[r#"
foo v0.0.1 ([ROOT]/foo)
├── newer-and-older v1.6.0
Expand Down Expand Up @@ -657,8 +651,7 @@ fn resolve_v3() {

// v3 should resolve for MSRV
p.cargo("generate-lockfile")
.arg("-Zmsrv-policy")
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
.masquerade_as_nightly_cargo(&["edition2024"])
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[LOCKING] 2 packages to latest Rust 1.60.0 compatible versions
Expand All @@ -668,8 +661,7 @@ fn resolve_v3() {
"#]])
.run();
p.cargo("tree")
.arg("-Zmsrv-policy")
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
.masquerade_as_nightly_cargo(&["edition2024"])
.with_stdout_data(str![[r#"
foo v0.0.1 ([ROOT]/foo)
├── newer-and-older v1.5.0
Expand All @@ -685,12 +677,10 @@ foo v0.0.1 ([ROOT]/foo)
[LOCKING] 2 packages to latest compatible versions

"#]])
.arg("-Zmsrv-policy")
.masquerade_as_nightly_cargo(&["msrv-policy"])
.masquerade_as_nightly_cargo(&["edition2024"])
.run();
p.cargo("tree")
.arg("-Zmsrv-policy")
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
.masquerade_as_nightly_cargo(&["edition2024"])
.with_stdout_data(str![[r#"
foo v0.0.1 ([ROOT]/foo)
├── newer-and-older v1.6.0
Expand All @@ -707,12 +697,10 @@ foo v0.0.1 ([ROOT]/foo)
[LOCKING] 2 packages to latest compatible versions

"#]])
.arg("-Zmsrv-policy")
.masquerade_as_nightly_cargo(&["msrv-policy"])
.masquerade_as_nightly_cargo(&["edition2024"])
.run();
p.cargo("tree")
.arg("-Zmsrv-policy")
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
.masquerade_as_nightly_cargo(&["edition2024"])
.with_stdout_data(str![[r#"
foo v0.0.1 ([ROOT]/foo)
├── newer-and-older v1.6.0
Expand Down Expand Up @@ -977,8 +965,7 @@ fn cargo_install_ignores_resolver_v3_msrv_change() {
.publish();

cargo_process("install foo")
.arg("-Zmsrv-policy")
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
.masquerade_as_nightly_cargo(&["edition2024"])
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[DOWNLOADING] crates ...
Expand Down Expand Up @@ -1017,8 +1004,7 @@ fn cargo_install_ignores_edition_2024_msrv_change() {
.publish();

cargo_process("install foo")
.arg("-Zmsrv-policy")
.masquerade_as_nightly_cargo(&["edition2024", "msrv-policy"])
.masquerade_as_nightly_cargo(&["edition2024"])
.with_stderr_data(str![[r#"
[UPDATING] `dummy-registry` index
[DOWNLOADING] crates ...
Expand Down