diff --git a/src/cargo/ops/cargo_update.rs b/src/cargo/ops/cargo_update.rs index 1725841274e..42d0bfc8713 100644 --- a/src/cargo/ops/cargo_update.rs +++ b/src/cargo/ops/cargo_update.rs @@ -492,15 +492,21 @@ fn print_lockfile_generation( resolve: &Resolve, registry: &mut PackageRegistry<'_>, ) -> CargoResult<()> { - let changes = PackageChange::new(resolve); - let num_pkgs: usize = changes.iter().filter(|change| change.kind.is_new()).count(); - if num_pkgs <= 1 { - // just ourself, nothing worth reporting + let changes = PackageChange::new(ws, resolve); + let num_pkgs: usize = changes + .iter() + .filter(|change| change.kind.is_new() && !change.is_member.unwrap_or(false)) + .count(); + if num_pkgs == 0 { + // nothing worth reporting return Ok(()); } status_locking(ws, num_pkgs)?; for change in changes { + if change.is_member.unwrap_or(false) { + continue; + }; match change.kind { PackageChangeKind::Added => { let possibilities = if let Some(query) = change.alternatives_query() { @@ -547,14 +553,21 @@ fn print_lockfile_sync( resolve: &Resolve, registry: &mut PackageRegistry<'_>, ) -> CargoResult<()> { - let changes = PackageChange::diff(previous_resolve, resolve); - let num_pkgs: usize = changes.iter().filter(|change| change.kind.is_new()).count(); + let changes = PackageChange::diff(ws, previous_resolve, resolve); + let num_pkgs: usize = changes + .iter() + .filter(|change| change.kind.is_new() && !change.is_member.unwrap_or(false)) + .count(); if num_pkgs == 0 { + // nothing worth reporting return Ok(()); } status_locking(ws, num_pkgs)?; for change in changes { + if change.is_member.unwrap_or(false) { + continue; + }; match change.kind { PackageChangeKind::Added | PackageChangeKind::Upgraded @@ -597,7 +610,7 @@ fn print_lockfile_updates( precise: bool, registry: &mut PackageRegistry<'_>, ) -> CargoResult<()> { - let changes = PackageChange::diff(previous_resolve, resolve); + let changes = PackageChange::diff(ws, previous_resolve, resolve); let num_pkgs: usize = changes.iter().filter(|change| change.kind.is_new()).count(); if !precise { status_locking(ws, num_pkgs)?; @@ -787,20 +800,23 @@ struct PackageChange { package_id: PackageId, previous_id: Option, kind: PackageChangeKind, + is_member: Option, } impl PackageChange { - pub fn new(resolve: &Resolve) -> Vec { + pub fn new(ws: &Workspace<'_>, resolve: &Resolve) -> Vec { let diff = PackageDiff::new(resolve); - Self::with_diff(diff) + Self::with_diff(diff, ws) } - pub fn diff(previous_resolve: &Resolve, resolve: &Resolve) -> Vec { + pub fn diff(ws: &Workspace<'_>, previous_resolve: &Resolve, resolve: &Resolve) -> Vec { let diff = PackageDiff::diff(previous_resolve, resolve); - Self::with_diff(diff) + Self::with_diff(diff, ws) } - fn with_diff(diff: impl Iterator) -> Vec { + fn with_diff(diff: impl Iterator, ws: &Workspace<'_>) -> Vec { + let member_ids: HashSet<_> = ws.members().map(|p| p.package_id()).collect(); + let mut changes = IndexMap::new(); for diff in diff { if let Some((previous_id, package_id)) = diff.change() { @@ -815,38 +831,46 @@ impl PackageChange { } else { PackageChangeKind::Upgraded }; + let is_member = Some(member_ids.contains(&package_id)); let change = Self { package_id, previous_id: Some(previous_id), kind, + is_member, }; changes.insert(change.package_id, change); } else { for package_id in diff.removed { let kind = PackageChangeKind::Removed; + let is_member = None; let change = Self { package_id, previous_id: None, kind, + is_member, }; changes.insert(change.package_id, change); } for package_id in diff.added { let kind = PackageChangeKind::Added; + let is_member = Some(member_ids.contains(&package_id)); let change = Self { package_id, previous_id: None, kind, + is_member, }; changes.insert(change.package_id, change); } } for package_id in diff.unchanged { let kind = PackageChangeKind::Unchanged; + let is_member = Some(member_ids.contains(&package_id)); let change = Self { package_id, previous_id: None, kind, + is_member, }; changes.insert(change.package_id, change); } diff --git a/tests/testsuite/alt_registry.rs b/tests/testsuite/alt_registry.rs index fa0dc31da6b..cc58f4ef0af 100644 --- a/tests/testsuite/alt_registry.rs +++ b/tests/testsuite/alt_registry.rs @@ -35,7 +35,7 @@ fn depend_on_alt_registry() { p.cargo("check") .with_stderr_data(str![[r#" [UPDATING] `alternative` index -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [DOWNLOADING] crates ... [DOWNLOADED] bar v0.0.1 (registry `alternative`) [CHECKING] bar v0.0.1 (registry `alternative`) @@ -88,7 +88,7 @@ fn depend_on_alt_registry_depends_on_same_registry_no_index() { p.cargo("check") .with_stderr_data(str![[r#" [UPDATING] `alternative` index -[LOCKING] 3 packages to latest compatible versions +[LOCKING] 2 packages to latest compatible versions [DOWNLOADING] crates ... [DOWNLOADED] baz v0.0.1 (registry `alternative`) [DOWNLOADED] bar v0.0.1 (registry `alternative`) @@ -131,7 +131,7 @@ fn depend_on_alt_registry_depends_on_same_registry() { p.cargo("check") .with_stderr_data(str![[r#" [UPDATING] `alternative` index -[LOCKING] 3 packages to latest compatible versions +[LOCKING] 2 packages to latest compatible versions [DOWNLOADING] crates ... [DOWNLOADED] baz v0.0.1 (registry `alternative`) [DOWNLOADED] bar v0.0.1 (registry `alternative`) @@ -176,7 +176,7 @@ fn depend_on_alt_registry_depends_on_crates_io() { str![[r#" [UPDATING] `alternative` index [UPDATING] `dummy-registry` index -[LOCKING] 3 packages to latest compatible versions +[LOCKING] 2 packages to latest compatible versions [DOWNLOADING] crates ... [DOWNLOADED] baz v0.0.1 (registry `dummy-registry`) [DOWNLOADED] bar v0.0.1 (registry `alternative`) @@ -217,7 +217,7 @@ fn registry_and_path_dep_works() { p.cargo("check") .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [CHECKING] bar v0.0.1 ([ROOT]/foo/bar) [CHECKING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -435,7 +435,7 @@ fn alt_registry_and_crates_io_deps() { str![[r#" [UPDATING] `alternative` index [UPDATING] `dummy-registry` index -[LOCKING] 3 packages to latest compatible versions +[LOCKING] 2 packages to latest compatible versions [DOWNLOADING] crates ... [DOWNLOADED] crates_io_dep v0.0.1 (registry `dummy-registry`) [DOWNLOADED] alt_reg_dep v0.1.0 (registry `alternative`) @@ -710,7 +710,7 @@ fn patch_alt_reg() { p.cargo("check") .with_stderr_data(str![[r#" [UPDATING] `alternative` index -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [CHECKING] bar v0.1.0 ([ROOT]/foo/bar) [CHECKING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -804,7 +804,7 @@ fn no_api() { p.cargo("check") .with_stderr_data(str![[r#" [UPDATING] `alternative` index -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [DOWNLOADING] crates ... [DOWNLOADED] bar v0.0.1 (registry `alternative`) [CHECKING] bar v0.0.1 (registry `alternative`) @@ -1657,7 +1657,7 @@ fn registries_index_relative_url() { p.cargo("check") .with_stderr_data(str![[r#" [UPDATING] `relative` index -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [DOWNLOADING] crates ... [DOWNLOADED] bar v0.0.1 (registry `relative`) [CHECKING] bar v0.0.1 (registry `relative`) diff --git a/tests/testsuite/artifact_dep.rs b/tests/testsuite/artifact_dep.rs index 261aa447d83..320d54f9d77 100644 --- a/tests/testsuite/artifact_dep.rs +++ b/tests/testsuite/artifact_dep.rs @@ -218,7 +218,7 @@ fn disallow_artifact_and_no_artifact_dep_to_same_package_within_the_same_dep_cat .masquerade_as_nightly_cargo(&["bindeps"]) .with_status(101) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [WARNING] foo v0.0.0 ([ROOT]/foo) ignoring invalid dependency `bar_stable` which is missing a lib target [ERROR] the crate `foo v0.0.0 ([ROOT]/foo)` depends on crate `bar v0.5.0 ([ROOT]/foo/bar)` multiple times with different names @@ -328,7 +328,7 @@ fn features_are_unified_among_lib_and_bin_dep_of_same_target() { p.cargo("build -Z bindeps") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 3 packages to latest compatible versions +[LOCKING] 2 packages to latest compatible versions [COMPILING] d2 v0.0.1 ([ROOT]/foo/d2) [COMPILING] d1 v0.0.1 ([ROOT]/foo/d1) [COMPILING] foo v0.0.1 ([ROOT]/foo) @@ -439,7 +439,7 @@ fn features_are_not_unified_among_lib_and_bin_dep_of_different_target() { .masquerade_as_nightly_cargo(&["bindeps"]) .with_status(101) .with_stderr_data(str![[r#" -[LOCKING] 3 packages to latest compatible versions +[LOCKING] 2 packages to latest compatible versions [COMPILING] d2 v0.0.1 ([ROOT]/foo/d2) [COMPILING] d1 v0.0.1 ([ROOT]/foo/d1) error[E0425]: cannot find function `f2` in crate `d2` @@ -601,7 +601,7 @@ fn build_script_with_bin_artifacts() { .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data( str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] foo v0.0.0 ([ROOT]/foo) [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -795,7 +795,7 @@ fn build_script_with_selected_dashed_bin_artifact_and_lib_true() { p.cargo("build -Z bindeps") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar-baz v0.5.0 ([ROOT]/foo/bar) [COMPILING] foo v0.0.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -891,7 +891,7 @@ fn lib_with_selected_dashed_bin_artifact_and_lib_true() { p.cargo("build -Z bindeps") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar-baz v0.5.0 ([ROOT]/foo/bar) [COMPILING] foo v0.0.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -942,7 +942,7 @@ fn allow_artifact_and_no_artifact_dep_to_same_package_within_different_dep_categ p.cargo("test -Z bindeps") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [COMPILING] foo v0.0.0 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1017,7 +1017,7 @@ fn disallow_using_example_binaries_as_artifacts() { .masquerade_as_nightly_cargo(&["bindeps"]) .with_status(101) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [ERROR] dependency `bar` in package `foo` requires a `bin:one-example` artifact to be present. "#]]) @@ -1070,7 +1070,7 @@ fn allow_artifact_and_non_artifact_dependency_to_same_crate() { p.cargo("check -Z bindeps") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [COMPILING] foo v0.0.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1194,7 +1194,7 @@ fn build_script_deps_adopt_do_not_allow_multiple_targets_under_different_name_an .masquerade_as_nightly_cargo(&["bindeps"]) .with_status(101) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [ERROR] the crate `foo v0.0.0 ([ROOT]/foo)` depends on crate `bar v0.5.0 ([ROOT]/foo/bar)` multiple times with different names "#]]) @@ -1300,7 +1300,7 @@ fn no_cross_doctests_works_with_artifacts() { .arg(&target) .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [COMPILING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1447,7 +1447,7 @@ fn profile_override_basic() { .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data( str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [COMPILING] foo v0.0.1 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build [..] -C opt-level=1 [..]` @@ -1559,7 +1559,7 @@ fn artifact_dep_target_specified() { p.cargo("check -Z bindeps") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bindep v0.0.0 ([ROOT]/foo/bindep) [CHECKING] foo v0.0.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1796,7 +1796,7 @@ fn allow_dep_renames_with_multiple_versions() { .with_stderr_data( str![[r#" [UPDATING] `dummy-registry` index -[LOCKING] 3 packages to latest compatible versions +[LOCKING] 2 packages to latest compatible versions [DOWNLOADING] crates ... [DOWNLOADED] bar v1.0.0 (registry `dummy-registry`) [COMPILING] bar v1.0.0 @@ -1858,7 +1858,7 @@ fn allow_artifact_and_non_artifact_dependency_to_same_crate_if_these_are_not_the p.cargo("build -Z bindeps") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar v0.0.1 ([ROOT]/foo/bar) [COMPILING] foo v0.0.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1894,7 +1894,7 @@ fn prevent_no_lib_warning_with_artifact_dependencies() { p.cargo("check -Z bindeps") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [CHECKING] foo v0.0.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1931,7 +1931,7 @@ fn show_no_lib_warning_with_artifact_dependencies_that_have_no_lib_but_lib_true( p.cargo("check -Z bindeps") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [WARNING] foo v0.0.0 ([ROOT]/foo) ignoring invalid dependency `bar` which is missing a lib target [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [CHECKING] foo v0.0.0 ([ROOT]/foo) @@ -1999,7 +1999,7 @@ fn check_missing_crate_type_in_package_fails() { .masquerade_as_nightly_cargo(&["bindeps"]) .with_status(101) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [ERROR] dependency `bar` in package `foo` requires a [..] artifact to be present. "#]]) @@ -2150,7 +2150,7 @@ fn env_vars_and_build_products_for_various_build_targets() { p.cargo("test -Z bindeps") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [COMPILING] foo v0.0.0 ([ROOT]/foo) [FINISHED] `test` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -2335,7 +2335,7 @@ fn doc_lib_true() { p.cargo("doc -Z bindeps") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar v0.0.1 ([ROOT]/foo/bar) [DOCUMENTING] bar v0.0.1 ([ROOT]/foo/bar) [DOCUMENTING] foo v0.0.1 ([ROOT]/foo) @@ -2417,7 +2417,7 @@ fn rustdoc_works_on_libs_with_artifacts_and_lib_false() { p.cargo("doc -Z bindeps") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [DOCUMENTING] foo v0.0.1 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -2624,7 +2624,7 @@ fn calc_bin_artifact_fingerprint() { p.cargo("check -Z bindeps") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [CHECKING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -2703,7 +2703,7 @@ fn with_target_and_optional() { p.cargo("check -Z bindeps -F d1 -v") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] d1 v0.0.1 ([ROOT]/foo/d1) [RUNNING] `rustc --crate-name d1 [..]--crate-type bin[..] [CHECKING] foo v0.0.1 ([ROOT]/foo) @@ -2753,7 +2753,7 @@ fn with_assumed_host_target_and_optional_build_dep() { .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data( str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] foo v0.0.1 ([ROOT]/foo) [COMPILING] d1 v0.0.1 ([ROOT]/foo/d1) [RUNNING] `rustc --crate-name build_script_build --edition=2021 [..]--crate-type bin[..] @@ -2882,7 +2882,7 @@ fn decouple_same_target_transitive_dep_from_artifact_dep() { p.cargo("build -Z bindeps") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 5 packages to latest compatible versions +[LOCKING] 4 packages to latest compatible versions [COMPILING] c v0.1.0 ([ROOT]/foo/c) [COMPILING] b v0.1.0 ([ROOT]/foo/b) [COMPILING] a v0.1.0 ([ROOT]/foo/a) @@ -2985,7 +2985,7 @@ fn decouple_same_target_transitive_dep_from_artifact_dep_lib() { p.cargo("build -Z bindeps") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 4 packages to latest compatible versions +[LOCKING] 3 packages to latest compatible versions [COMPILING] b v0.1.0 ([ROOT]/foo/b) [COMPILING] a v0.1.0 ([ROOT]/foo/a) [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) @@ -3112,7 +3112,7 @@ fn decouple_same_target_transitive_dep_from_artifact_dep_and_proc_macro() { .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data( str![[r#" -[LOCKING] 6 packages to latest compatible versions +[LOCKING] 5 packages to latest compatible versions [COMPILING] d v0.1.0 ([ROOT]/foo/d) [COMPILING] a v0.1.0 ([ROOT]/foo/a) [COMPILING] b v0.1.0 ([ROOT]/foo/b) @@ -3179,7 +3179,7 @@ fn same_target_artifact_dep_sharing() { p.cargo(&format!("build -Z bindeps --target {target}")) .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 3 packages to latest compatible versions +[LOCKING] 2 packages to latest compatible versions [COMPILING] a v0.1.0 ([ROOT]/foo/a) [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [COMPILING] foo v0.1.0 ([ROOT]/foo) @@ -3235,7 +3235,7 @@ fn check_transitive_artifact_dependency_with_different_target() { p.cargo("check -Z bindeps") .masquerade_as_nightly_cargo(&["bindeps"]) .with_stderr_data(str![[r#" -[LOCKING] 3 packages to latest compatible versions +[LOCKING] 2 packages to latest compatible versions [ERROR] failed to determine target information for target `custom-target`. Artifact dependency `baz` in package `bar v0.0.0 ([ROOT]/foo/bar)` requires building for `custom-target` diff --git a/tests/testsuite/bad_config.rs b/tests/testsuite/bad_config.rs index 3c37e5d72f5..ace08f4392f 100644 --- a/tests/testsuite/bad_config.rs +++ b/tests/testsuite/bad_config.rs @@ -824,7 +824,7 @@ fn dev_dependencies2() { p.cargo("check").with_stderr_data(str![[r#" [WARNING] `dev_dependencies` is deprecated in favor of `dev-dependencies` and will not work in the 2024 edition (in the `foo` package) -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [CHECKING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -905,7 +905,7 @@ fn dev_dependencies2_conflict() { .build(); p.cargo("check").with_stderr_data(str![[r#" [WARNING] `dev_dependencies` is redundant with `dev-dependencies`, preferring `dev-dependencies` in the `foo` package -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [CHECKING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -942,7 +942,7 @@ fn build_dependencies2() { p.cargo("check").with_stderr_data(str![[r#" [WARNING] `build_dependencies` is deprecated in favor of `build-dependencies` and will not work in the 2024 edition (in the `foo` package) -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [CHECKING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1023,7 +1023,7 @@ fn build_dependencies2_conflict() { .build(); p.cargo("check").with_stderr_data(str![[r#" [WARNING] `build_dependencies` is redundant with `build-dependencies`, preferring `build-dependencies` in the `foo` package -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [CHECKING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1401,7 +1401,7 @@ fn cargo_platform_build_dependencies2() { .with_stderr_data(str![[r#" [WARNING] `build_dependencies` is deprecated in favor of `build-dependencies` and will not work in the 2024 edition (in the `[HOST_TARGET]` platform target) -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] build v0.5.0 ([ROOT]/foo/build) [COMPILING] foo v0.5.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1492,7 +1492,7 @@ fn cargo_platform_build_dependencies2_conflict() { p.cargo("check") .with_stderr_data(str![[r#" [WARNING] `build_dependencies` is redundant with `build-dependencies`, preferring `build-dependencies` in the `[HOST_TARGET]` platform target -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] build v0.5.0 ([ROOT]/foo/build) [COMPILING] foo v0.5.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1535,7 +1535,7 @@ fn cargo_platform_dev_dependencies2() { .with_stderr_data(str![[r#" [WARNING] `dev_dependencies` is deprecated in favor of `dev-dependencies` and will not work in the 2024 edition (in the `[HOST_TARGET]` platform target) -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [CHECKING] foo v0.5.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1622,7 +1622,7 @@ fn cargo_platform_dev_dependencies2_conflict() { p.cargo("check") .with_stderr_data(str![[r#" [WARNING] `dev_dependencies` is redundant with `dev-dependencies`, preferring `dev-dependencies` in the `[HOST_TARGET]` platform target -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [CHECKING] foo v0.5.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1667,7 +1667,7 @@ fn default_features2() { p.cargo("check").with_stderr_data(str![[r#" [WARNING] `default_features` is deprecated in favor of `default-features` and will not work in the 2024 edition (in the `a` dependency) -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [CHECKING] a v0.1.0 ([ROOT]/foo/a) [CHECKING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1761,7 +1761,7 @@ fn default_features2_conflict() { p.cargo("check").with_stderr_data(str![[r#" [WARNING] `default_features` is redundant with `default-features`, preferring `default-features` in the `a` dependency -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [CHECKING] a v0.1.0 ([ROOT]/foo/a) [CHECKING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -1840,7 +1840,6 @@ fn workspace_default_features2() { str![[r#" [WARNING] [ROOT]/foo/workspace_only/Cargo.toml: `default_features` is deprecated in favor of `default-features` and will not work in the 2024 edition (in the `dep_workspace_only` dependency) -[LOCKING] 4 packages to latest compatible versions [CHECKING] dep_package_only v0.1.0 ([ROOT]/foo/dep_package_only) [CHECKING] dep_workspace_only v0.1.0 ([ROOT]/foo/dep_workspace_only) [CHECKING] package_only v0.1.0 ([ROOT]/foo/package_only) @@ -2782,7 +2781,7 @@ fn warn_semver_metadata() { p.cargo("check").with_stderr_data(str![[r#" [WARNING] version requirement `1.0.0+1234` for dependency `bar` includes semver metadata which will be ignored, removing the metadata is recommended to avoid confusion [UPDATING] `dummy-registry` index -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [DOWNLOADING] crates ... [DOWNLOADED] bar v1.0.0 (registry `dummy-registry`) [CHECKING] bar v1.0.0 diff --git a/tests/testsuite/bench.rs b/tests/testsuite/bench.rs index 28e97051a00..e9ba49176ad 100644 --- a/tests/testsuite/bench.rs +++ b/tests/testsuite/bench.rs @@ -543,7 +543,7 @@ fn bench_with_deep_lib_dep() { p.cargo("bench") .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] foo v0.0.1 ([ROOT]/foo) [COMPILING] bar v0.0.1 ([ROOT]/bar) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s @@ -1094,7 +1094,7 @@ fn bench_dylib() { p.cargo("bench -v") .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar v0.0.1 ([ROOT]/foo/bar) [RUNNING] [..] -C opt-level=3 [..] [COMPILING] foo v0.0.1 ([ROOT]/foo) @@ -1605,7 +1605,7 @@ fn test_bench_multiple_packages() { "#]]) .with_stderr_data( str![[r#" -[LOCKING] 3 packages to latest compatible versions +[LOCKING] 2 packages to latest compatible versions [COMPILING] bar v0.1.0 ([ROOT]/bar) [COMPILING] baz v0.1.0 ([ROOT]/baz) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s @@ -1668,7 +1668,6 @@ fn bench_all_workspace() { p.cargo("bench --workspace") .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [COMPILING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s @@ -1860,7 +1859,6 @@ fn bench_all_virtual_manifest() { p.cargo("bench --workspace") .with_stderr_data( str![[r#" -[LOCKING] 2 packages to latest compatible versions [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [COMPILING] baz v0.1.0 ([ROOT]/foo/baz) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s @@ -1943,7 +1941,6 @@ fn bench_virtual_manifest_glob() { // This should not have `bar` built or benched p.cargo("bench -p '*z'") .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions [COMPILING] baz v0.1.0 ([ROOT]/foo/baz) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s [RUNNING] unittests src/lib.rs (target/release/deps/baz-[HASH][EXE]) @@ -2052,7 +2049,6 @@ fn bench_virtual_manifest_all_implied() { p.cargo("bench") .with_stderr_data( str![[r#" -[LOCKING] 2 packages to latest compatible versions [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [COMPILING] baz v0.1.0 ([ROOT]/foo/baz) [FINISHED] `bench` profile [optimized] target(s) in [ELAPSED]s diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs index 93254deadb1..09a7814cc7a 100644 --- a/tests/testsuite/build.rs +++ b/tests/testsuite/build.rs @@ -870,7 +870,6 @@ fn cargo_compile_with_invalid_code_in_deps() { .with_status(101) .with_stderr_data( str![[r#" -[LOCKING] 3 packages to latest compatible versions [COMPILING] bar v0.1.0 ([ROOT]/bar) [COMPILING] baz v0.1.0 ([ROOT]/baz) [ERROR] could not compile `bar` (lib) due to 1 previous error @@ -939,7 +938,7 @@ fn cargo_compile_with_warnings_in_a_dep_package() { p.cargo("build") .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [WARNING] [..]dead[..] ... @@ -3423,7 +3422,7 @@ fn bad_platform_specific_dependency() { p.cargo("build") .with_status(101) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] foo v0.5.0 ([ROOT]/foo) error[E0463]: can't find crate for `bar` ... @@ -3653,7 +3652,7 @@ fn transitive_dependencies_not_available() { p.cargo("build -v") .with_status(101) .with_stderr_data(str![[r#" -[LOCKING] 3 packages to latest compatible versions +[LOCKING] 2 packages to latest compatible versions [COMPILING] bbbbb v0.0.1 ([ROOT]/foo/b) [RUNNING] `rustc [..] [COMPILING] aaaaa v0.0.1 ([ROOT]/foo/a) @@ -4064,7 +4063,7 @@ fn invalid_spec() { p.cargo("build -p notAValidDep") .with_status(101) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [ERROR] package ID specification `notAValidDep` did not match any packages "#]]) @@ -4511,7 +4510,6 @@ fn build_all_workspace() { p.cargo("build --workspace") .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [COMPILING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -4545,7 +4543,6 @@ fn build_all_exclude() { p.cargo("build --workspace --exclude baz") .with_stderr_data( str![[r#" -[LOCKING] 3 packages to latest compatible versions [COMPILING] foo v0.1.0 ([ROOT]/foo) [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -4617,7 +4614,6 @@ fn build_all_exclude_not_found() { .with_stderr_data( str![[r#" [WARNING] excluded package(s) `baz` not found in workspace `[ROOT]/foo` -[LOCKING] 2 packages to latest compatible versions [COMPILING] foo v0.1.0 ([ROOT]/foo) [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -4653,7 +4649,6 @@ fn build_all_exclude_glob() { p.cargo("build --workspace --exclude '*z'") .with_stderr_data( str![[r#" -[LOCKING] 3 packages to latest compatible versions [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [COMPILING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -4688,7 +4683,6 @@ fn build_all_exclude_glob_not_found() { .with_stderr_data( str![[r#" [WARNING] excluded package pattern(s) `*z` not found in workspace `[ROOT]/foo` -[LOCKING] 2 packages to latest compatible versions [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [COMPILING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -4747,7 +4741,6 @@ fn build_all_workspace_implicit_examples() { p.cargo("build --workspace --examples") .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [COMPILING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -4784,7 +4777,6 @@ fn build_all_virtual_manifest() { p.cargo("build --workspace") .with_stderr_data( str![[r#" -[LOCKING] 2 packages to latest compatible versions [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [COMPILING] baz v0.1.0 ([ROOT]/foo/baz) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -4815,7 +4807,6 @@ fn build_virtual_manifest_all_implied() { p.cargo("build") .with_stderr_data( str![[r#" -[LOCKING] 2 packages to latest compatible versions [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [COMPILING] baz v0.1.0 ([ROOT]/foo/baz) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -4844,7 +4835,6 @@ fn build_virtual_manifest_one_project() { p.cargo("build -p bar") .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -4870,7 +4860,6 @@ fn build_virtual_manifest_glob() { p.cargo("build -p '*z'") .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions [COMPILING] baz v0.1.0 ([ROOT]/foo/baz) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -4955,7 +4944,6 @@ fn build_all_virtual_manifest_implicit_examples() { p.cargo("build --workspace --examples") .with_stderr_data( str![[r#" -[LOCKING] 2 packages to latest compatible versions [COMPILING] baz v0.1.0 ([ROOT]/foo/baz) [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -5004,7 +4992,7 @@ fn build_all_member_dependency_same_name() { p.cargo("build --workspace") .with_stderr_data(str![[r#" [UPDATING] `dummy-registry` index -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [DOWNLOADING] crates ... [DOWNLOADED] a v0.1.0 (registry `dummy-registry`) [COMPILING] a v0.1.0 @@ -5240,7 +5228,7 @@ fn rustc_wrapper_relative() { .env("RUSTC_WRAPPER", &relative_path) .with_stderr_data(str![[r#" [UPDATING] `dummy-registry` index -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [DOWNLOADING] crates ... [DOWNLOADED] bar v1.0.0 (registry `dummy-registry`) [COMPILING] bar v1.0.0 @@ -5773,7 +5761,7 @@ fn building_a_dependent_crate_without_bin_should_fail() { .with_status(101) .with_stderr_data(str![[r#" [UPDATING] `dummy-registry` index -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [DOWNLOADING] crates ... [DOWNLOADED] testless v0.1.0 (registry `dummy-registry`) [ERROR] failed to download replaced source registry `crates-io` @@ -6017,7 +6005,7 @@ fn no_linkable_target() { .build(); p.cargo("build") .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [WARNING] The package `the_lib` provides no linkable target. The compiler might raise an error while compiling `foo`. Consider adding 'dylib' or 'rlib' to key `crate-type` in `the_lib`'s Cargo.toml. This warning might turn into a hard error in the future. [COMPILING] the_lib v0.1.0 ([ROOT]/foo/the_lib) [COMPILING] foo v0.1.0 ([ROOT]/foo) @@ -6173,7 +6161,6 @@ fn target_filters_workspace() { ws.cargo("build -v --example ex") .with_status(101) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions [ERROR] no example target named `ex` Did you mean `ex1`? @@ -6235,7 +6222,6 @@ fn target_filters_workspace_not_found() { ws.cargo("build -v --lib") .with_status(101) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions [ERROR] no library targets found in packages: a, b "#]]) @@ -6295,7 +6281,7 @@ fn signal_display() { foo.cargo("build") .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] pm v0.1.0 ([ROOT]/foo/pm) [COMPILING] foo v0.1.0 ([ROOT]/foo) [ERROR] could not compile `foo` (lib) @@ -6353,7 +6339,7 @@ fn pipelining_works() { foo.cargo("build") .with_stdout_data(str![]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [COMPILING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -6418,7 +6404,6 @@ fn pipelining_big_graph() { .with_status(101) .with_stderr_data( str![[r#" -[LOCKING] 61 packages to latest compatible versions [COMPILING] a30 v0.5.0 ([ROOT]/foo/a30) [ERROR] don't actually build me ... @@ -6485,7 +6470,7 @@ b "#]]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar v0.1.0 ([ROOT]/foo/bar) [COMPILING] foo v0.1.0 ([ROOT]/foo) c diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs index 00e0b21752b..1dd316c3d0e 100644 --- a/tests/testsuite/build_script.rs +++ b/tests/testsuite/build_script.rs @@ -882,7 +882,7 @@ fn custom_build_script_rustc_flags() { .build(); p.cargo("build --verbose").with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] foo v0.5.0 ([ROOT]/foo/foo) [RUNNING] `rustc --crate-name build_script_build --edition=2015 foo/build.rs [..]` [RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` @@ -936,7 +936,7 @@ fn custom_build_script_rustc_flags_no_space() { .build(); p.cargo("build --verbose").with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] foo v0.5.0 ([ROOT]/foo/foo) [RUNNING] `rustc --crate-name build_script_build --edition=2015 foo/build.rs [..]` [RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build` @@ -1071,7 +1071,7 @@ fn links_duplicates_old_registry() { .with_status(101) .with_stderr_data(str![[r#" [UPDATING] `dummy-registry` index -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [DOWNLOADING] crates ... [DOWNLOADED] bar v0.1.0 (registry `dummy-registry`) [ERROR] multiple packages link to native library `a`, but a native library can be linked only once @@ -1221,7 +1221,7 @@ fn overrides_and_links() { p.cargo("build -v") .with_stderr_data( str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] a v0.5.0 ([ROOT]/foo/a) [COMPILING] foo v0.5.0 ([ROOT]/foo) [RUNNING] `rustc --crate-name build_script_build [..]` @@ -1698,7 +1698,7 @@ fn build_deps_simple() { .build(); p.cargo("build -v").with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] a v0.5.0 ([ROOT]/foo/a) [RUNNING] `rustc --crate-name a [..]` [COMPILING] foo v0.5.0 ([ROOT]/foo) @@ -1811,7 +1811,7 @@ fn build_cmd_with_a_build_cmd() { .build(); p.cargo("build -v").with_stderr_data(str![[r#" -[LOCKING] 3 packages to latest compatible versions +[LOCKING] 2 packages to latest compatible versions [COMPILING] b v0.5.0 ([ROOT]/foo/b) [RUNNING] `rustc --crate-name b [..]` [COMPILING] a v0.5.0 ([ROOT]/foo/a) @@ -2980,7 +2980,7 @@ fn flags_go_into_tests() { p.cargo("test -v --test=foo") .with_stderr_data(str![[r#" -[LOCKING] 3 packages to latest compatible versions +[LOCKING] 2 packages to latest compatible versions [COMPILING] a v0.5.0 ([ROOT]/foo/a) [RUNNING] `rustc [..] a/build.rs [..]` [RUNNING] `[ROOT]/foo/target/debug/build/a-[HASH]/build-script-build` @@ -3094,7 +3094,7 @@ fn diamond_passes_args_only_once() { p.cargo("build -v") .with_stderr_data(str![[r#" -[LOCKING] 4 packages to latest compatible versions +[LOCKING] 3 packages to latest compatible versions [COMPILING] c v0.5.0 ([ROOT]/foo/c) [RUNNING] `rustc --crate-name build_script_build [..]` [RUNNING] `[ROOT]/foo/target/debug/build/c-[HASH]/build-script-build` @@ -3970,7 +3970,7 @@ fn warnings_hidden_for_upstream() { p.cargo("build -v") .with_stderr_data(str![[r#" [UPDATING] `dummy-registry` index -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [DOWNLOADING] crates ... [DOWNLOADED] bar v0.1.0 (registry `dummy-registry`) [COMPILING] bar v0.1.0 @@ -4031,7 +4031,7 @@ fn warnings_printed_on_vv() { p.cargo("build -vv") .with_stderr_data(str![[r#" [UPDATING] `dummy-registry` index -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [DOWNLOADING] crates ... [DOWNLOADED] bar v0.1.0 (registry `dummy-registry`) [COMPILING] bar v0.1.0 @@ -4811,7 +4811,7 @@ fn optional_build_dep_and_required_normal_dep() { "#]]) .with_stderr_data(str![[r#" -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [COMPILING] bar v0.5.0 ([ROOT]/foo/bar) [COMPILING] foo v0.1.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s diff --git a/tests/testsuite/build_script_extra_link_arg.rs b/tests/testsuite/build_script_extra_link_arg.rs index c7cd8b5fd24..9a4c0eb11b7 100644 --- a/tests/testsuite/build_script_extra_link_arg.rs +++ b/tests/testsuite/build_script_extra_link_arg.rs @@ -275,7 +275,7 @@ fn link_arg_transitive_not_allowed() { p.cargo("build -v") .with_stderr_data(str![[r#" [UPDATING] `dummy-registry` index -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [DOWNLOADING] crates ... [DOWNLOADED] bar v1.0.0 (registry `dummy-registry`) [COMPILING] bar v1.0.0 diff --git a/tests/testsuite/cache_messages.rs b/tests/testsuite/cache_messages.rs index 4f003e79676..ac73f8e66db 100644 --- a/tests/testsuite/cache_messages.rs +++ b/tests/testsuite/cache_messages.rs @@ -277,7 +277,7 @@ fn very_verbose() { p.cargo("check -vv") .with_stderr_data(str![[r#" [UPDATING] `dummy-registry` index -[LOCKING] 2 packages to latest compatible versions +[LOCKING] 1 package to latest compatible version [DOWNLOADING] crates ... [DOWNLOADED] bar v1.0.0 (registry `dummy-registry`) [CHECKING] bar v1.0.0 diff --git a/tests/testsuite/cargo_add/add_basic/stderr.term.svg b/tests/testsuite/cargo_add/add_basic/stderr.term.svg index 67951dce229..70346fd1a3c 100644 --- a/tests/testsuite/cargo_add/add_basic/stderr.term.svg +++ b/tests/testsuite/cargo_add/add_basic/stderr.term.svg @@ -22,7 +22,7 @@ Adding my-package v99999.0.0 to dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/add_multiple/stderr.term.svg b/tests/testsuite/cargo_add/add_multiple/stderr.term.svg index 85495e25ae0..12862297016 100644 --- a/tests/testsuite/cargo_add/add_multiple/stderr.term.svg +++ b/tests/testsuite/cargo_add/add_multiple/stderr.term.svg @@ -24,7 +24,7 @@ Adding my-package2 v99999.0.0 to dependencies - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions diff --git a/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/stderr.term.svg b/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/stderr.term.svg index 9416b8e4738..5b040784b99 100644 --- a/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/stderr.term.svg +++ b/tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/stderr.term.svg @@ -42,7 +42,7 @@ - serde_test - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/add_normalized_name_external/stderr.term.svg b/tests/testsuite/cargo_add/add_normalized_name_external/stderr.term.svg index 3eba852ce79..f4fcd4007a4 100644 --- a/tests/testsuite/cargo_add/add_normalized_name_external/stderr.term.svg +++ b/tests/testsuite/cargo_add/add_normalized_name_external/stderr.term.svg @@ -56,7 +56,7 @@ - unstable - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions diff --git a/tests/testsuite/cargo_add/build/stderr.term.svg b/tests/testsuite/cargo_add/build/stderr.term.svg index ff8ed4bff8e..ad278aaf23f 100644 --- a/tests/testsuite/cargo_add/build/stderr.term.svg +++ b/tests/testsuite/cargo_add/build/stderr.term.svg @@ -24,7 +24,7 @@ Adding my-build-package2 v99999.0.0 to build-dependencies - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions diff --git a/tests/testsuite/cargo_add/build_prefer_existing_version/stderr.term.svg b/tests/testsuite/cargo_add/build_prefer_existing_version/stderr.term.svg index 1b2e598d685..f7d9173b0b8 100644 --- a/tests/testsuite/cargo_add/build_prefer_existing_version/stderr.term.svg +++ b/tests/testsuite/cargo_add/build_prefer_existing_version/stderr.term.svg @@ -27,7 +27,7 @@ - two - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/change_rename_target/stderr.term.svg b/tests/testsuite/cargo_add/change_rename_target/stderr.term.svg index 72373b21c52..ad09ca2264d 100644 --- a/tests/testsuite/cargo_add/change_rename_target/stderr.term.svg +++ b/tests/testsuite/cargo_add/change_rename_target/stderr.term.svg @@ -24,7 +24,7 @@ Adding feature `some-package` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/cyclic_features/stderr.term.svg b/tests/testsuite/cargo_add/cyclic_features/stderr.term.svg index 0d2de2a3de1..1d9fc9eebd3 100644 --- a/tests/testsuite/cargo_add/cyclic_features/stderr.term.svg +++ b/tests/testsuite/cargo_add/cyclic_features/stderr.term.svg @@ -28,7 +28,7 @@ + feature-two - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/default_features/stderr.term.svg b/tests/testsuite/cargo_add/default_features/stderr.term.svg index 9580237cc24..dac62f4c166 100644 --- a/tests/testsuite/cargo_add/default_features/stderr.term.svg +++ b/tests/testsuite/cargo_add/default_features/stderr.term.svg @@ -26,7 +26,7 @@ Adding my-package2 v0.4.1 to dependencies - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions Adding my-package2 v0.4.1+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit/stderr.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit/stderr.term.svg index c390449c994..890a67bc986 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit/stderr.term.svg +++ b/tests/testsuite/cargo_add/detect_workspace_inherit/stderr.term.svg @@ -1,4 +1,4 @@ - + - unrelated - Locking 2 packages to latest compatible versions - - + diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.term.svg index 89cd0b0f748..c8ef4f9c980 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.term.svg +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_optional/stderr.term.svg @@ -1,4 +1,4 @@ - + Adding feature `foo` - Locking 2 packages to latest compatible versions - - + diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.term.svg index 00e36531d64..170ace3143c 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.term.svg +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_public/stderr.term.svg @@ -1,4 +1,4 @@ - + Adding my-dev-package2 v99999.0.0 to dev-dependencies - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions diff --git a/tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.term.svg b/tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.term.svg index 96954b6c79e..2fb1ec16d99 100644 --- a/tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.term.svg +++ b/tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.term.svg @@ -27,7 +27,7 @@ - two - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/features/stderr.term.svg b/tests/testsuite/cargo_add/features/stderr.term.svg index 4d9add23cd3..714add36113 100644 --- a/tests/testsuite/cargo_add/features/stderr.term.svg +++ b/tests/testsuite/cargo_add/features/stderr.term.svg @@ -33,7 +33,7 @@ - nose - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/features_activated_over_limit/stderr.term.svg b/tests/testsuite/cargo_add/features_activated_over_limit/stderr.term.svg index 05129c36aab..bead185fa38 100644 --- a/tests/testsuite/cargo_add/features_activated_over_limit/stderr.term.svg +++ b/tests/testsuite/cargo_add/features_activated_over_limit/stderr.term.svg @@ -28,7 +28,7 @@ 100 deactivated features - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.term.svg b/tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.term.svg index 2ff99b73471..1f00dcf69a0 100644 --- a/tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.term.svg +++ b/tests/testsuite/cargo_add/features_deactivated_over_limit/stderr.term.svg @@ -86,7 +86,7 @@ 170 deactivated features - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/features_empty/stderr.term.svg b/tests/testsuite/cargo_add/features_empty/stderr.term.svg index 910ec691e61..259352b0e79 100644 --- a/tests/testsuite/cargo_add/features_empty/stderr.term.svg +++ b/tests/testsuite/cargo_add/features_empty/stderr.term.svg @@ -33,7 +33,7 @@ - nose - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/features_multiple_occurrences/stderr.term.svg b/tests/testsuite/cargo_add/features_multiple_occurrences/stderr.term.svg index bb54116fa10..d2400ae42bc 100644 --- a/tests/testsuite/cargo_add/features_multiple_occurrences/stderr.term.svg +++ b/tests/testsuite/cargo_add/features_multiple_occurrences/stderr.term.svg @@ -33,7 +33,7 @@ - mouth - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/features_preserve/stderr.term.svg b/tests/testsuite/cargo_add/features_preserve/stderr.term.svg index 4d9add23cd3..714add36113 100644 --- a/tests/testsuite/cargo_add/features_preserve/stderr.term.svg +++ b/tests/testsuite/cargo_add/features_preserve/stderr.term.svg @@ -33,7 +33,7 @@ - nose - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/features_spaced_values/stderr.term.svg b/tests/testsuite/cargo_add/features_spaced_values/stderr.term.svg index bb54116fa10..d2400ae42bc 100644 --- a/tests/testsuite/cargo_add/features_spaced_values/stderr.term.svg +++ b/tests/testsuite/cargo_add/features_spaced_values/stderr.term.svg @@ -33,7 +33,7 @@ - mouth - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/git/stderr.term.svg b/tests/testsuite/cargo_add/git/stderr.term.svg index 19f7c7fbeba..bc01d8268f8 100644 --- a/tests/testsuite/cargo_add/git/stderr.term.svg +++ b/tests/testsuite/cargo_add/git/stderr.term.svg @@ -24,7 +24,7 @@ Updating git repository `[ROOTURL]/git-package` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/git_branch/stderr.term.svg b/tests/testsuite/cargo_add/git_branch/stderr.term.svg index 19f7c7fbeba..bc01d8268f8 100644 --- a/tests/testsuite/cargo_add/git_branch/stderr.term.svg +++ b/tests/testsuite/cargo_add/git_branch/stderr.term.svg @@ -24,7 +24,7 @@ Updating git repository `[ROOTURL]/git-package` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/git_dev/stderr.term.svg b/tests/testsuite/cargo_add/git_dev/stderr.term.svg index 7aba39bbd33..bdc2976cefe 100644 --- a/tests/testsuite/cargo_add/git_dev/stderr.term.svg +++ b/tests/testsuite/cargo_add/git_dev/stderr.term.svg @@ -24,7 +24,7 @@ Updating git repository `[ROOTURL]/git-package` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/git_inferred_name/stderr.term.svg b/tests/testsuite/cargo_add/git_inferred_name/stderr.term.svg index 8f1bcf3433c..34cf73183a5 100644 --- a/tests/testsuite/cargo_add/git_inferred_name/stderr.term.svg +++ b/tests/testsuite/cargo_add/git_inferred_name/stderr.term.svg @@ -26,7 +26,7 @@ Updating git repository `[ROOTURL]/git-package` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/git_multiple_names/stderr.term.svg b/tests/testsuite/cargo_add/git_multiple_names/stderr.term.svg index 43ba071cdd6..15095587cae 100644 --- a/tests/testsuite/cargo_add/git_multiple_names/stderr.term.svg +++ b/tests/testsuite/cargo_add/git_multiple_names/stderr.term.svg @@ -26,7 +26,7 @@ Updating git repository `[ROOTURL]/git-package` - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions diff --git a/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.term.svg b/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.term.svg index ad2e215c060..c1d52050413 100644 --- a/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.term.svg +++ b/tests/testsuite/cargo_add/git_multiple_packages_features/stderr.term.svg @@ -28,7 +28,7 @@ Updating git repository `[ROOTURL]/git-package` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/git_rev/stderr.term.svg b/tests/testsuite/cargo_add/git_rev/stderr.term.svg index 19f7c7fbeba..bc01d8268f8 100644 --- a/tests/testsuite/cargo_add/git_rev/stderr.term.svg +++ b/tests/testsuite/cargo_add/git_rev/stderr.term.svg @@ -24,7 +24,7 @@ Updating git repository `[ROOTURL]/git-package` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/git_tag/stderr.term.svg b/tests/testsuite/cargo_add/git_tag/stderr.term.svg index 19f7c7fbeba..bc01d8268f8 100644 --- a/tests/testsuite/cargo_add/git_tag/stderr.term.svg +++ b/tests/testsuite/cargo_add/git_tag/stderr.term.svg @@ -24,7 +24,7 @@ Updating git repository `[ROOTURL]/git-package` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/infer_prerelease/stderr.term.svg b/tests/testsuite/cargo_add/infer_prerelease/stderr.term.svg index d4b6818bcdd..554f12a0997 100644 --- a/tests/testsuite/cargo_add/infer_prerelease/stderr.term.svg +++ b/tests/testsuite/cargo_add/infer_prerelease/stderr.term.svg @@ -22,7 +22,7 @@ Adding prerelease_only v0.2.0-alpha.1 to dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/list_features/stderr.term.svg b/tests/testsuite/cargo_add/list_features/stderr.term.svg index 910ec691e61..259352b0e79 100644 --- a/tests/testsuite/cargo_add/list_features/stderr.term.svg +++ b/tests/testsuite/cargo_add/list_features/stderr.term.svg @@ -33,7 +33,7 @@ - nose - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/list_features_path/stderr.term.svg b/tests/testsuite/cargo_add/list_features_path/stderr.term.svg index d22cbe8081b..c2bfc437b63 100644 --- a/tests/testsuite/cargo_add/list_features_path/stderr.term.svg +++ b/tests/testsuite/cargo_add/list_features_path/stderr.term.svg @@ -35,7 +35,7 @@ Updating `dummy-registry` index - Locking 4 packages to latest compatible versions + Locking 1 package to latest compatible version Adding my-package v0.1.1+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/list_features_path_no_default/stderr.term.svg b/tests/testsuite/cargo_add/list_features_path_no_default/stderr.term.svg index 59bf472fdc4..00f0c40d3e6 100644 --- a/tests/testsuite/cargo_add/list_features_path_no_default/stderr.term.svg +++ b/tests/testsuite/cargo_add/list_features_path_no_default/stderr.term.svg @@ -35,7 +35,7 @@ Updating `dummy-registry` index - Locking 4 packages to latest compatible versions + Locking 1 package to latest compatible version Adding my-package v0.1.1+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/manifest_path_package/stderr.term.svg b/tests/testsuite/cargo_add/manifest_path_package/stderr.term.svg index 602e208606e..298799cea86 100644 --- a/tests/testsuite/cargo_add/manifest_path_package/stderr.term.svg +++ b/tests/testsuite/cargo_add/manifest_path_package/stderr.term.svg @@ -1,4 +1,4 @@ - + - unrelated - Locking 2 packages to latest compatible versions - - + diff --git a/tests/testsuite/cargo_add/namever/stderr.term.svg b/tests/testsuite/cargo_add/namever/stderr.term.svg index a3aee0c87d4..b9b7272d826 100644 --- a/tests/testsuite/cargo_add/namever/stderr.term.svg +++ b/tests/testsuite/cargo_add/namever/stderr.term.svg @@ -28,7 +28,7 @@ Adding my-package v99999.0.0 to dependencies - Locking 4 packages to latest compatible versions + Locking 3 packages to latest compatible versions Adding my-package2 v0.2.3+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/no_default_features/stderr.term.svg b/tests/testsuite/cargo_add/no_default_features/stderr.term.svg index 9580237cc24..dac62f4c166 100644 --- a/tests/testsuite/cargo_add/no_default_features/stderr.term.svg +++ b/tests/testsuite/cargo_add/no_default_features/stderr.term.svg @@ -26,7 +26,7 @@ Adding my-package2 v0.4.1 to dependencies - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions Adding my-package2 v0.4.1+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/no_optional/stderr.term.svg b/tests/testsuite/cargo_add/no_optional/stderr.term.svg index e069063639f..eaa9c860056 100644 --- a/tests/testsuite/cargo_add/no_optional/stderr.term.svg +++ b/tests/testsuite/cargo_add/no_optional/stderr.term.svg @@ -22,7 +22,7 @@ Adding my-package v0.1.0 to dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/no_public/stderr.term.svg b/tests/testsuite/cargo_add/no_public/stderr.term.svg index e069063639f..eaa9c860056 100644 --- a/tests/testsuite/cargo_add/no_public/stderr.term.svg +++ b/tests/testsuite/cargo_add/no_public/stderr.term.svg @@ -22,7 +22,7 @@ Adding my-package v0.1.0 to dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/optional/stderr.term.svg b/tests/testsuite/cargo_add/optional/stderr.term.svg index 84f872f9276..5bcecc3ca0e 100644 --- a/tests/testsuite/cargo_add/optional/stderr.term.svg +++ b/tests/testsuite/cargo_add/optional/stderr.term.svg @@ -24,7 +24,7 @@ Adding feature `my-package` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_default_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_default_features/stderr.term.svg index 9580237cc24..dac62f4c166 100644 --- a/tests/testsuite/cargo_add/overwrite_default_features/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_default_features/stderr.term.svg @@ -26,7 +26,7 @@ Adding my-package2 v0.4.1 to dependencies - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions Adding my-package2 v0.4.1+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.term.svg index 9580237cc24..dac62f4c166 100644 --- a/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_default_features_with_no_default_features/stderr.term.svg @@ -26,7 +26,7 @@ Adding my-package2 v0.4.1 to dependencies - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions Adding my-package2 v0.4.1+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/overwrite_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_features/stderr.term.svg index bb54116fa10..d2400ae42bc 100644 --- a/tests/testsuite/cargo_add/overwrite_features/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_features/stderr.term.svg @@ -33,7 +33,7 @@ - mouth - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.term.svg index 597efa5a7e2..430d0e59603 100644 --- a/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_git_with_path/stderr.term.svg @@ -22,7 +22,7 @@ Adding feature `cargo-list-test-fixture-dependency` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.term.svg index 66462328b3a..9d470ccc0fe 100644 --- a/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_inherit_features_noop/stderr.term.svg @@ -1,4 +1,4 @@ - + + test - Locking 2 packages to latest compatible versions - - + diff --git a/tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.term.svg index c390449c994..890a67bc986 100644 --- a/tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_inherit_noop/stderr.term.svg @@ -1,4 +1,4 @@ - + Adding feature `foo` - Locking 2 packages to latest compatible versions - - + diff --git a/tests/testsuite/cargo_add/overwrite_inline_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_inline_features/stderr.term.svg index e34e3070713..d777800a082 100644 --- a/tests/testsuite/cargo_add/overwrite_inline_features/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_inline_features/stderr.term.svg @@ -34,7 +34,7 @@ + nose - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions diff --git a/tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.term.svg index 79828366c05..3e4aa0e2034 100644 --- a/tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_name_dev_noop/stderr.term.svg @@ -26,7 +26,7 @@ + nose - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_name_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_name_noop/stderr.term.svg index bcaf7865b2c..04377cbc99d 100644 --- a/tests/testsuite/cargo_add/overwrite_name_noop/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_name_noop/stderr.term.svg @@ -28,7 +28,7 @@ Adding feature `your-face` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_default_features/stderr.term.svg index 9580237cc24..dac62f4c166 100644 --- a/tests/testsuite/cargo_add/overwrite_no_default_features/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_no_default_features/stderr.term.svg @@ -26,7 +26,7 @@ Adding my-package2 v0.4.1 to dependencies - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions Adding my-package2 v0.4.1+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.term.svg index 9580237cc24..dac62f4c166 100644 --- a/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_no_default_features_with_default_features/stderr.term.svg @@ -26,7 +26,7 @@ Adding my-package2 v0.4.1 to dependencies - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions Adding my-package2 v0.4.1+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/overwrite_no_optional/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_optional/stderr.term.svg index e069063639f..eaa9c860056 100644 --- a/tests/testsuite/cargo_add/overwrite_no_optional/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_no_optional/stderr.term.svg @@ -22,7 +22,7 @@ Adding my-package v0.1.0 to dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.term.svg index 84f872f9276..5bcecc3ca0e 100644 --- a/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_no_optional_with_optional/stderr.term.svg @@ -24,7 +24,7 @@ Adding feature `my-package` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_no_public/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_public/stderr.term.svg index e069063639f..eaa9c860056 100644 --- a/tests/testsuite/cargo_add/overwrite_no_public/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_no_public/stderr.term.svg @@ -22,7 +22,7 @@ Adding my-package v0.1.0 to dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.term.svg index 0c05501aacf..fdfb40bab98 100644 --- a/tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_no_public_with_public/stderr.term.svg @@ -22,7 +22,7 @@ Adding my-package v0.1.0 to public dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_optional/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_optional/stderr.term.svg index 84f872f9276..5bcecc3ca0e 100644 --- a/tests/testsuite/cargo_add/overwrite_optional/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_optional/stderr.term.svg @@ -24,7 +24,7 @@ Adding feature `my-package` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.term.svg index 910ec691e61..259352b0e79 100644 --- a/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.term.svg @@ -33,7 +33,7 @@ - nose - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.term.svg index d2ce76306a1..c64b6d93cb5 100644 --- a/tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_optional_with_optional/stderr.term.svg @@ -22,7 +22,7 @@ Adding my-package1 v99999.0.0 to optional dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_path_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_path_noop/stderr.term.svg index bcaf7865b2c..04377cbc99d 100644 --- a/tests/testsuite/cargo_add/overwrite_path_noop/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_path_noop/stderr.term.svg @@ -28,7 +28,7 @@ Adding feature `your-face` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.term.svg index d2bab110c2e..0755e89c410 100644 --- a/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_path_with_version/stderr.term.svg @@ -26,7 +26,7 @@ Adding feature `cargo-list-test-fixture-dependency` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version Adding cargo-list-test-fixture-dependency v20.0.0+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.term.svg index bb54116fa10..d2400ae42bc 100644 --- a/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.term.svg @@ -33,7 +33,7 @@ - mouth - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_public/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_public/stderr.term.svg index 0c05501aacf..fdfb40bab98 100644 --- a/tests/testsuite/cargo_add/overwrite_public/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_public/stderr.term.svg @@ -22,7 +22,7 @@ Adding my-package v0.1.0 to public dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.term.svg index e069063639f..eaa9c860056 100644 --- a/tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_public_with_no_public/stderr.term.svg @@ -22,7 +22,7 @@ Adding my-package v0.1.0 to dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.term.svg index 1ee5c582ed3..e3302b700b6 100644 --- a/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_rename_with_no_rename/stderr.term.svg @@ -24,7 +24,7 @@ Adding versioned-package v99999.0.0 to dependencies - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions Adding versioned-package v0.1.1+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.term.svg index 1ee5c582ed3..e3302b700b6 100644 --- a/tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename/stderr.term.svg @@ -24,7 +24,7 @@ Adding versioned-package v99999.0.0 to dependencies - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions Adding versioned-package v0.1.1+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.term.svg index ad7afbca3b0..526addf300c 100644 --- a/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_rename_with_rename_noop/stderr.term.svg @@ -26,7 +26,7 @@ Adding feature `a1` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version Adding versioned-package v0.1.1+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.term.svg index 1c3a0a44bb2..1ab9284356d 100644 --- a/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_version_with_git/stderr.term.svg @@ -26,7 +26,7 @@ Updating git repository `[ROOTURL]/versioned-package` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.term.svg index 597efa5a7e2..430d0e59603 100644 --- a/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_version_with_path/stderr.term.svg @@ -22,7 +22,7 @@ Adding feature `cargo-list-test-fixture-dependency` - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/overwrite_with_rename/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_with_rename/stderr.term.svg index 1ee5c582ed3..e3302b700b6 100644 --- a/tests/testsuite/cargo_add/overwrite_with_rename/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_with_rename/stderr.term.svg @@ -24,7 +24,7 @@ Adding versioned-package v99999.0.0 to dependencies - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions Adding versioned-package v0.1.1+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.term.svg b/tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.term.svg index bf5b9de583b..4c665536937 100644 --- a/tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.term.svg +++ b/tests/testsuite/cargo_add/overwrite_workspace_dep/stderr.term.svg @@ -1,4 +1,4 @@ - + - unrelated - Locking 2 packages to latest compatible versions - - + diff --git a/tests/testsuite/cargo_add/path/stderr.term.svg b/tests/testsuite/cargo_add/path/stderr.term.svg index 602e208606e..6781757da4a 100644 --- a/tests/testsuite/cargo_add/path/stderr.term.svg +++ b/tests/testsuite/cargo_add/path/stderr.term.svg @@ -20,7 +20,7 @@ Adding cargo-list-test-fixture-dependency (local) to dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/path_dev/stderr.term.svg b/tests/testsuite/cargo_add/path_dev/stderr.term.svg index 194dce16295..c4a8bc01449 100644 --- a/tests/testsuite/cargo_add/path_dev/stderr.term.svg +++ b/tests/testsuite/cargo_add/path_dev/stderr.term.svg @@ -20,7 +20,7 @@ Adding cargo-list-test-fixture-dependency (local) to dev-dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/path_inferred_name/stderr.term.svg b/tests/testsuite/cargo_add/path_inferred_name/stderr.term.svg index 602e208606e..6781757da4a 100644 --- a/tests/testsuite/cargo_add/path_inferred_name/stderr.term.svg +++ b/tests/testsuite/cargo_add/path_inferred_name/stderr.term.svg @@ -20,7 +20,7 @@ Adding cargo-list-test-fixture-dependency (local) to dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/preserve_dep_std_table/stderr.term.svg b/tests/testsuite/cargo_add/preserve_dep_std_table/stderr.term.svg index 910ec691e61..259352b0e79 100644 --- a/tests/testsuite/cargo_add/preserve_dep_std_table/stderr.term.svg +++ b/tests/testsuite/cargo_add/preserve_dep_std_table/stderr.term.svg @@ -33,7 +33,7 @@ - nose - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/preserve_features_sorted/stderr.term.svg b/tests/testsuite/cargo_add/preserve_features_sorted/stderr.term.svg index d596eb518eb..48676b73ad1 100644 --- a/tests/testsuite/cargo_add/preserve_features_sorted/stderr.term.svg +++ b/tests/testsuite/cargo_add/preserve_features_sorted/stderr.term.svg @@ -34,7 +34,7 @@ + e - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/preserve_features_table/stderr.term.svg b/tests/testsuite/cargo_add/preserve_features_table/stderr.term.svg index 910ec691e61..259352b0e79 100644 --- a/tests/testsuite/cargo_add/preserve_features_table/stderr.term.svg +++ b/tests/testsuite/cargo_add/preserve_features_table/stderr.term.svg @@ -33,7 +33,7 @@ - nose - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/preserve_features_unsorted/stderr.term.svg b/tests/testsuite/cargo_add/preserve_features_unsorted/stderr.term.svg index d596eb518eb..48676b73ad1 100644 --- a/tests/testsuite/cargo_add/preserve_features_unsorted/stderr.term.svg +++ b/tests/testsuite/cargo_add/preserve_features_unsorted/stderr.term.svg @@ -34,7 +34,7 @@ + e - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/preserve_sorted/stderr.term.svg b/tests/testsuite/cargo_add/preserve_sorted/stderr.term.svg index 6692351c070..05dabbe02ef 100644 --- a/tests/testsuite/cargo_add/preserve_sorted/stderr.term.svg +++ b/tests/testsuite/cargo_add/preserve_sorted/stderr.term.svg @@ -24,7 +24,7 @@ Adding toml v99999.0.0 to dependencies - Locking 4 packages to latest compatible versions + Locking 3 packages to latest compatible versions Adding my-package v0.1.1+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/preserve_unsorted/stderr.term.svg b/tests/testsuite/cargo_add/preserve_unsorted/stderr.term.svg index 6692351c070..05dabbe02ef 100644 --- a/tests/testsuite/cargo_add/preserve_unsorted/stderr.term.svg +++ b/tests/testsuite/cargo_add/preserve_unsorted/stderr.term.svg @@ -24,7 +24,7 @@ Adding toml v99999.0.0 to dependencies - Locking 4 packages to latest compatible versions + Locking 3 packages to latest compatible versions Adding my-package v0.1.1+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/public/stderr.term.svg b/tests/testsuite/cargo_add/public/stderr.term.svg index 0c05501aacf..fdfb40bab98 100644 --- a/tests/testsuite/cargo_add/public/stderr.term.svg +++ b/tests/testsuite/cargo_add/public/stderr.term.svg @@ -22,7 +22,7 @@ Adding my-package v0.1.0 to public dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/registry/stderr.term.svg b/tests/testsuite/cargo_add/registry/stderr.term.svg index 82d2549d9ee..5614bf58bc4 100644 --- a/tests/testsuite/cargo_add/registry/stderr.term.svg +++ b/tests/testsuite/cargo_add/registry/stderr.term.svg @@ -24,7 +24,7 @@ Adding my-package2 v99999.0.0 to dependencies - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions diff --git a/tests/testsuite/cargo_add/rename/stderr.term.svg b/tests/testsuite/cargo_add/rename/stderr.term.svg index 67951dce229..70346fd1a3c 100644 --- a/tests/testsuite/cargo_add/rename/stderr.term.svg +++ b/tests/testsuite/cargo_add/rename/stderr.term.svg @@ -22,7 +22,7 @@ Adding my-package v99999.0.0 to dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/require_weak/stderr.term.svg b/tests/testsuite/cargo_add/require_weak/stderr.term.svg index 910ec691e61..259352b0e79 100644 --- a/tests/testsuite/cargo_add/require_weak/stderr.term.svg +++ b/tests/testsuite/cargo_add/require_weak/stderr.term.svg @@ -33,7 +33,7 @@ - nose - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/rust_version_ignore/stderr.term.svg b/tests/testsuite/cargo_add/rust_version_ignore/stderr.term.svg index 18ded07930d..f8bbfb2a221 100644 --- a/tests/testsuite/cargo_add/rust_version_ignore/stderr.term.svg +++ b/tests/testsuite/cargo_add/rust_version_ignore/stderr.term.svg @@ -22,7 +22,7 @@ Adding rust-version-user v0.2.1 to dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/rust_version_latest/stderr.term.svg b/tests/testsuite/cargo_add/rust_version_latest/stderr.term.svg index 139b5cbbc13..cd9ff7e186d 100644 --- a/tests/testsuite/cargo_add/rust_version_latest/stderr.term.svg +++ b/tests/testsuite/cargo_add/rust_version_latest/stderr.term.svg @@ -22,7 +22,7 @@ Adding rust-version-user v0.2.1 to dependencies - Locking 2 packages to latest Rust 1.72 compatible versions + Locking 1 package to latest Rust 1.72 compatible version diff --git a/tests/testsuite/cargo_add/rust_version_older/stderr.term.svg b/tests/testsuite/cargo_add/rust_version_older/stderr.term.svg index c29eba06b8a..88ed26b72a2 100644 --- a/tests/testsuite/cargo_add/rust_version_older/stderr.term.svg +++ b/tests/testsuite/cargo_add/rust_version_older/stderr.term.svg @@ -26,7 +26,7 @@ Adding rust-version-user v0.1.0 to dependencies - Locking 2 packages to latest Rust 1.70 compatible versions + Locking 1 package to latest Rust 1.70 compatible version Adding rust-version-user v0.1.0 (latest: v0.2.1) diff --git a/tests/testsuite/cargo_add/rustc_ignore/stderr.term.svg b/tests/testsuite/cargo_add/rustc_ignore/stderr.term.svg index 18ded07930d..f8bbfb2a221 100644 --- a/tests/testsuite/cargo_add/rustc_ignore/stderr.term.svg +++ b/tests/testsuite/cargo_add/rustc_ignore/stderr.term.svg @@ -22,7 +22,7 @@ Adding rust-version-user v0.2.1 to dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/rustc_latest/stderr.term.svg b/tests/testsuite/cargo_add/rustc_latest/stderr.term.svg index f6c82094c9a..2bc90ebbf6b 100644 --- a/tests/testsuite/cargo_add/rustc_latest/stderr.term.svg +++ b/tests/testsuite/cargo_add/rustc_latest/stderr.term.svg @@ -1,4 +1,4 @@ - + Adding rust-version-user v0.1.1 to dependencies - Locking 2 packages to latest Rust [..] compatible versions + Locking 1 package to latest Rust [..] compatible version Adding rust-version-user v0.1.1 (latest: v0.2.1) diff --git a/tests/testsuite/cargo_add/rustc_older/stderr.term.svg b/tests/testsuite/cargo_add/rustc_older/stderr.term.svg index f6c82094c9a..2bc90ebbf6b 100644 --- a/tests/testsuite/cargo_add/rustc_older/stderr.term.svg +++ b/tests/testsuite/cargo_add/rustc_older/stderr.term.svg @@ -1,4 +1,4 @@ - + Adding rust-version-user v0.1.1 to dependencies - Locking 2 packages to latest Rust [..] compatible versions + Locking 1 package to latest Rust [..] compatible version Adding rust-version-user v0.1.1 (latest: v0.2.1) diff --git a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.term.svg b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.term.svg index 979dc8686bd..451f56deed9 100644 --- a/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.term.svg +++ b/tests/testsuite/cargo_add/sorted_table_with_dotted_item/stderr.term.svg @@ -24,7 +24,7 @@ Adding unrelateed-crate v99999.0.0 to dependencies - Locking 5 packages to latest compatible versions + Locking 4 packages to latest compatible versions Adding my-build-package1 v0.1.1+my-package (latest: v99999.0.0+my-package) diff --git a/tests/testsuite/cargo_add/target/stderr.term.svg b/tests/testsuite/cargo_add/target/stderr.term.svg index 8d97e11aee5..7d6e918e40d 100644 --- a/tests/testsuite/cargo_add/target/stderr.term.svg +++ b/tests/testsuite/cargo_add/target/stderr.term.svg @@ -24,7 +24,7 @@ Adding my-package2 v99999.0.0 to dependencies for target `wasm32-unknown-unknown` - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions diff --git a/tests/testsuite/cargo_add/target_cfg/stderr.term.svg b/tests/testsuite/cargo_add/target_cfg/stderr.term.svg index 491ed799125..15f82846dcb 100644 --- a/tests/testsuite/cargo_add/target_cfg/stderr.term.svg +++ b/tests/testsuite/cargo_add/target_cfg/stderr.term.svg @@ -24,7 +24,7 @@ Adding my-package2 v99999.0.0 to dependencies for target `cfg(target_os="linux")` - Locking 3 packages to latest compatible versions + Locking 2 packages to latest compatible versions diff --git a/tests/testsuite/cargo_add/vers/stderr.term.svg b/tests/testsuite/cargo_add/vers/stderr.term.svg index d6188518c7e..d6007fab4df 100644 --- a/tests/testsuite/cargo_add/vers/stderr.term.svg +++ b/tests/testsuite/cargo_add/vers/stderr.term.svg @@ -22,7 +22,7 @@ Adding my-package >=0.1.1 to dependencies - Locking 2 packages to latest compatible versions + Locking 1 package to latest compatible version diff --git a/tests/testsuite/cargo_add/workspace_name/stderr.term.svg b/tests/testsuite/cargo_add/workspace_name/stderr.term.svg index 602e208606e..298799cea86 100644 --- a/tests/testsuite/cargo_add/workspace_name/stderr.term.svg +++ b/tests/testsuite/cargo_add/workspace_name/stderr.term.svg @@ -1,4 +1,4 @@ - +