From 1d0c6ebd8feba1903807dfbc0b224deb60f62b9f Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Tue, 16 Apr 2024 13:35:25 -0500
Subject: [PATCH] feat(install): Including Locking message

As we switch to MSRV-aware resolver, this will help users work out why
MSRV-aware resolving isn't helping them.

This will also make it more obvious if we breaking things when
developing the MSRV-aware resolver.
---
 src/cargo/ops/resolve.rs             | 3 +++
 tests/testsuite/directory.rs         | 2 ++
 tests/testsuite/install.rs           | 3 +++
 tests/testsuite/publish_lockfile.rs  | 1 +
 tests/testsuite/required_features.rs | 1 +
 5 files changed, 10 insertions(+)

diff --git a/src/cargo/ops/resolve.rs b/src/cargo/ops/resolve.rs
index f937c3182..286649dc8 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 1ba7677bc..3af475a35 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 ec7bfe7bd..89d40ada9 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 64455fd3c..19c783aaa 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 76c9cd0bc..f192be50d 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`