diff --git a/src/cargo/ops/resolve.rs b/src/cargo/ops/resolve.rs index f937c31824f..286649dc8df 100644 --- a/src/cargo/ops/resolve.rs +++ b/src/cargo/ops/resolve.rs @@ -147,6 +147,7 @@ pub fn resolve_ws_with_opts<'gctx>( specs, add_patches, )?; + ops::print_lockfile_changes(ws, None, &resolved_with_overrides, &mut registry)?; (resolve, resolved_with_overrides) } else if ws.require_optional_deps() { // First, resolve the root_package's *listed* dependencies, as well as @@ -205,6 +206,8 @@ pub fn resolve_ws_with_opts<'gctx>( specs, add_patches, )?; + // Skipping `print_lockfile_changes` as there are cases where this prints irrelevant + // information (resolve, resolved_with_overrides) }; diff --git a/tests/testsuite/directory.rs b/tests/testsuite/directory.rs index 1ba7677bc63..3af475a358a 100644 --- a/tests/testsuite/directory.rs +++ b/tests/testsuite/directory.rs @@ -148,6 +148,7 @@ fn simple_install() { .with_stderr( "\ [INSTALLING] bar v0.1.0 +[LOCKING] 2 packages to latest compatible versions [COMPILING] foo v0.0.1 [COMPILING] bar v0.1.0 [FINISHED] `release` profile [optimized] target(s) in [..]s @@ -243,6 +244,7 @@ fn install_without_feature_dep() { .with_stderr( "\ [INSTALLING] bar v0.1.0 +[LOCKING] 2 packages to latest compatible versions [COMPILING] foo v0.0.1 [COMPILING] bar v0.1.0 [FINISHED] `release` profile [optimized] target(s) in [..]s diff --git a/tests/testsuite/install.rs b/tests/testsuite/install.rs index ec7bfe7bd9a..89d40ada954 100644 --- a/tests/testsuite/install.rs +++ b/tests/testsuite/install.rs @@ -2410,6 +2410,8 @@ fn self_referential() { [DOWNLOADING] crates ... [DOWNLOADED] foo v0.0.2 (registry [..]) [INSTALLING] foo v0.0.2 +[LOCKING] 2 packages to latest compatible versions +[ADDING] foo v0.0.1 (latest: v0.0.2) [DOWNLOADING] crates ... [DOWNLOADED] foo v0.0.1 (registry [..]) [COMPILING] foo v0.0.1 @@ -2455,6 +2457,7 @@ fn ambiguous_registry_vs_local_package() { "\ [INSTALLING] foo v0.1.0 ([..]) [UPDATING] `[..]` index +[LOCKING] 2 packages to latest compatible versions [DOWNLOADING] crates ... [DOWNLOADED] foo v0.0.1 (registry [..]) [COMPILING] foo v0.0.1 diff --git a/tests/testsuite/publish_lockfile.rs b/tests/testsuite/publish_lockfile.rs index 64455fd3cd1..19c783aaab5 100644 --- a/tests/testsuite/publish_lockfile.rs +++ b/tests/testsuite/publish_lockfile.rs @@ -415,6 +415,7 @@ dependencies = [ "\ [UPDATING] `[..]` index [INSTALLING] foo v0.1.0 +[LOCKING] 2 packages to latest compatible versions [DOWNLOADING] crates ... [DOWNLOADED] bar v0.1.1 (registry `[..]`) [COMPILING] bar v0.1.1 diff --git a/tests/testsuite/required_features.rs b/tests/testsuite/required_features.rs index 76c9cd0bc4d..f192be50d40 100644 --- a/tests/testsuite/required_features.rs +++ b/tests/testsuite/required_features.rs @@ -1129,6 +1129,7 @@ Consider enabling them by passing, e.g., `--features=\"bar/a\"` .with_stderr( "\ [INSTALLING] foo v0.0.1 ([..]) +[LOCKING] 2 packages to latest compatible versions [FINISHED] `release` profile [optimized] target(s) in [..] [WARNING] none of the package's binaries are available for install using the selected features bin \"foo\" requires the features: `bar/a`