From 3a47885f4f2e54ec6a6ed49ff1f1dca3d25d3320 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 19 Sep 2024 15:29:05 -0500 Subject: [PATCH] test(msrv): Clarify role of deps --- tests/testsuite/rust_version.rs | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/testsuite/rust_version.rs b/tests/testsuite/rust_version.rs index 8c08d9ad5..84785cf88 100644 --- a/tests/testsuite/rust_version.rs +++ b/tests/testsuite/rust_version.rs @@ -409,19 +409,19 @@ foo v0.0.1 ([ROOT]/foo) #[cargo_test] fn resolve_with_multiple_rust_versions() { - Package::new("only-newer", "1.65.0") + Package::new("shared-only-newer", "1.65.0") .rust_version("1.65.0") .file("src/lib.rs", "fn other_stuff() {}") .publish(); - Package::new("newer-and-older", "1.45.0") + Package::new("shared-newer-and-older", "1.45.0") .rust_version("1.45.0") .file("src/lib.rs", "fn other_stuff() {}") .publish(); - Package::new("newer-and-older", "1.55.0") + Package::new("shared-newer-and-older", "1.55.0") .rust_version("1.55.0") .file("src/lib.rs", "fn other_stuff() {}") .publish(); - Package::new("newer-and-older", "1.65.0") + Package::new("shared-newer-and-older", "1.65.0") .rust_version("1.65.0") .file("src/lib.rs", "fn other_stuff() {}") .publish(); @@ -441,8 +441,8 @@ fn resolve_with_multiple_rust_versions() { rust-version = "1.60.0" [dependencies] - only-newer = "1" - newer-and-older = "1" + shared-only-newer = "1" + shared-newer-and-older = "1" "#, ) .file("src/main.rs", "fn main() {}") @@ -457,8 +457,8 @@ fn resolve_with_multiple_rust_versions() { rust-version = "1.50.0" [dependencies] - only-newer = "1" - newer-and-older = "1" + shared-only-newer = "1" + shared-newer-and-older = "1" "#, ) .file("lower/src/main.rs", "fn main() {}") @@ -477,8 +477,8 @@ fn resolve_with_multiple_rust_versions() { p.cargo("tree") .with_stdout_data(str![[r#" higher v0.0.1 ([ROOT]/foo) -├── newer-and-older v1.65.0 -└── only-newer v1.65.0 +├── shared-newer-and-older v1.65.0 +└── shared-only-newer v1.65.0 "#]]) .run(); @@ -490,16 +490,16 @@ higher v0.0.1 ([ROOT]/foo) .with_stderr_data(str![[r#" [UPDATING] `dummy-registry` index [LOCKING] 2 packages to latest Rust 1.50.0 compatible versions -[ADDING] newer-and-older v1.45.0 (available: v1.65.0, requires Rust 1.65.0) -[ADDING] only-newer v1.65.0 (requires Rust 1.65.0) +[ADDING] shared-newer-and-older v1.45.0 (available: v1.65.0, requires Rust 1.65.0) +[ADDING] shared-only-newer v1.65.0 (requires Rust 1.65.0) "#]]) .run(); p.cargo("tree") .with_stdout_data(str![[r#" higher v0.0.1 ([ROOT]/foo) -├── newer-and-older v1.45.0 -└── only-newer v1.65.0 +├── shared-newer-and-older v1.45.0 +└── shared-only-newer v1.65.0 "#]]) .run();