feat(update): Summarize unchanged packages with updates

`--verbose` will show them.

This is prep for telling the user about `--breaking` and other flags.

Author: epage

crates/cargo-test-support/src/compare.rs

@@ -208,6 +208,7 @@ fn substitute_macros(input: &str) -> String {
         ("[ADDING]", "      Adding"),
         ("[REMOVING]", "    Removing"),
         ("[REMOVED]", "     Removed"),
+        ("[UNCHANGED]", "   Unchanged"),
         ("[DOCTEST]", "   Doc-tests"),
         ("[PACKAGING]", "   Packaging"),
         ("[PACKAGED]", "    Packaged"),

src/cargo/ops/cargo_generate_lockfile.rs

@@ -1,5 +1,6 @@
 use crate::core::registry::PackageRegistry;
 use crate::core::resolver::features::{CliFeatures, HasDevUnits};
+use crate::core::shell::Verbosity;
 use crate::core::Registry as _;
 use crate::core::{PackageId, PackageIdSpec, PackageIdSpecQuery};
 use crate::core::{Resolve, SourceId, Workspace};
@@ -163,15 +164,19 @@ pub fn update_lockfile(ws: &Workspace<'_>, opts: &UpdateOptions<'_>) -> CargoRes
     let print_change = |status: &str, msg: String, color: &Style| {
         opts.config.shell().status_with_color(status, msg, color)
     };
-    for (removed, added) in compare_dependency_graphs(&previous_resolve, &resolve) {
-        let latest = if let Some(added) = added
-            .iter()
-            .rev()
-            .next()
-            .filter(|p| p.source_id().is_registry())
+    let mut unchanged_behind = 0;
+    for (removed, added, unchanged) in compare_dependency_graphs(&previous_resolve, &resolve) {
+        let highest_present = [added.iter().rev().next(), unchanged.iter().rev().next()]
+            .into_iter()
+            .flatten()
+            .max_by_key(|s| s.version());
+        let latest = if let Some(present) = highest_present.filter(|p| p.source_id().is_registry())
         {
-            let query =
-                crate::core::dependency::Dependency::parse(added.name(), None, added.source_id())?;
+            let query = crate::core::dependency::Dependency::parse(
+                present.name(),
+                None,
+                present.source_id(),
+            )?;
             let possibilities = loop {
                 match registry.query_vec(&query, QueryKind::Exact) {
                     std::task::Poll::Ready(res) => {
@@ -187,7 +192,7 @@ pub fn update_lockfile(ws: &Workspace<'_>, opts: &UpdateOptions<'_>) -> CargoRes
                 .filter(|s| s.version().pre.is_empty())
                 .map(|s| s.version().clone())
                 .max()
-                .filter(|v| added.version() < v)
+                .filter(|v| present.version() < v)
                 .map(|v| format!(" {warn}(latest: v{v}){warn:#}"))
         } else {
             None
@@ -222,6 +227,26 @@ pub fn update_lockfile(ws: &Workspace<'_>, opts: &UpdateOptions<'_>) -> CargoRes
                 print_change("Adding", format!("{package}{latest}"), &style::NOTE)?;
             }
         }
+        if !latest.is_empty() {
+            if opts.config.shell().verbosity() == Verbosity::Verbose {
+                for package in &unchanged {
+                    opts.config.shell().status_with_color(
+                        "Unchanged",
+                        format!("{package}{latest}"),
+                        &anstyle::Style::new().bold(),
+                    )?;
+                }
+            } else {
+                if !unchanged.is_empty() {
+                    unchanged_behind += 1;
+                }
+            }
+        }
+    }
+    if 0 < unchanged_behind {
+        opts.config.shell().note(format!(
+            "Pass `--verbose` to see {unchanged_behind} unchanged dependencies behind latest"
+        ))?;
     }
     if opts.dry_run {
         opts.config
@@ -250,7 +275,7 @@ pub fn update_lockfile(ws: &Workspace<'_>, opts: &UpdateOptions<'_>) -> CargoRes
     fn compare_dependency_graphs(
         previous_resolve: &Resolve,
         resolve: &Resolve,
-    ) -> Vec<(Vec<PackageId>, Vec<PackageId>)> {
+    ) -> Vec<(Vec<PackageId>, Vec<PackageId>, Vec<PackageId>)> {
         fn key(dep: PackageId) -> (&'static str, SourceId) {
             (dep.name().as_str(), dep.source_id())
         }
@@ -259,6 +284,10 @@ pub fn update_lockfile(ws: &Workspace<'_>, opts: &UpdateOptions<'_>) -> CargoRes
             a.iter().filter(|a| !contains_id(b, a)).cloned().collect()
         }
 
+        fn vec_intersection(a: &[PackageId], b: &[PackageId]) -> Vec<PackageId> {
+            a.iter().filter(|a| contains_id(b, a)).cloned().collect()
+        }
+
         // Check if a PackageId is present `b` from `a`.
         //
         // Note that this is somewhat more complicated because the equality for source IDs does not
@@ -288,7 +317,7 @@ pub fn update_lockfile(ws: &Workspace<'_>, opts: &UpdateOptions<'_>) -> CargoRes
 
         // Map `(package name, package source)` to `(removed versions, added versions)`.
         let mut changes = BTreeMap::new();
-        let empty = (Vec::new(), Vec::new());
+        let empty = (Vec::new(), Vec::new(), Vec::new());
         for dep in previous_resolve.iter() {
             changes
                 .entry(key(dep))
@@ -305,13 +334,15 @@ pub fn update_lockfile(ws: &Workspace<'_>, opts: &UpdateOptions<'_>) -> CargoRes
         }
 
         for v in changes.values_mut() {
-            let (ref mut old, ref mut new) = *v;
+            let (ref mut old, ref mut new, ref mut other) = *v;
             old.sort();
             new.sort();
             let removed = vec_subset(old, new);
             let added = vec_subset(new, old);
+            let unchanged = vec_intersection(new, old);
             *old = removed;
             *new = added;
+            *other = unchanged;
         }
         debug!("{:#?}", changes);
 

tests/testsuite/patch.rs

@@ -2430,6 +2430,7 @@ fn can_update_with_alt_reg() {
             "\
 [UPDATING] `alternative` index
 [UPDATING] `dummy-registry` index
+[NOTE] Pass `--verbose` to see 1 unchanged dependencies behind latest
 ",
         )
         .run();

tests/testsuite/registry.rs

@@ -1572,6 +1572,7 @@ fn update_multiple_packages() {
 [UPDATING] `[..]` index
 [UPDATING] a v0.1.0 -> v0.1.1
 [UPDATING] b v0.1.0 -> v0.1.1
+[NOTE] Pass `--verbose` to see 1 unchanged dependencies behind latest
 ",
         )
         .run();

tests/testsuite/replace.rs

@@ -539,13 +539,15 @@ fn override_adds_some_deps() {
             "\
 [UPDATING] git repository `file://[..]`
 [UPDATING] `dummy-registry` index
+[NOTE] Pass `--verbose` to see 1 unchanged dependencies behind latest
 ",
         )
         .run();
     p.cargo("update  https://github.com/rust-lang/crates.io-index#bar")
         .with_stderr(
             "\
 [UPDATING] `dummy-registry` index
+[NOTE] Pass `--verbose` to see 1 unchanged dependencies behind latest
 ",
         )
         .run();

tests/testsuite/update.rs

@@ -109,6 +109,7 @@ fn transitive_minor_update() {
         .with_stderr(
             "\
 [UPDATING] `[..]` index
+[NOTE] Pass `--verbose` to see 2 unchanged dependencies behind latest
 ",
         )
         .run();
@@ -160,6 +161,7 @@ fn conservative() {
             "\
 [UPDATING] `[..]` index
 [UPDATING] serde v0.1.0 -> v0.1.1
+[NOTE] Pass `--verbose` to see 1 unchanged dependencies behind latest
 ",
         )
         .run();
@@ -520,6 +522,7 @@ fn update_precise_do_not_force_update_deps() {
             "\
 [UPDATING] `[..]` index
 [UPDATING] serde v0.2.1 -> v0.2.2
+[NOTE] Pass `--verbose` to see 1 unchanged dependencies behind latest
 ",
         )
         .run();
@@ -898,6 +901,7 @@ fn dry_run_update() {
             "\
 [UPDATING] `[..]` index
 [UPDATING] serde v0.1.0 -> v0.1.1
+[NOTE] Pass `--verbose` to see 1 unchanged dependencies behind latest
 [WARNING] not updating lockfile due to dry run
 ",
         )
@@ -1522,6 +1526,7 @@ fn report_behind() {
         .with_stderr(
             "\
 [UPDATING] `dummy-registry` index
+[NOTE] Pass `--verbose` to see 1 unchanged dependencies behind latest
 [WARNING] not updating lockfile due to dry run
 ",
         )
@@ -1531,6 +1536,7 @@ fn report_behind() {
         .with_stderr(
             "\
 [UPDATING] `dummy-registry` index
+[UNCHANGED] breaking v0.1.1 (latest: v0.2.0)
 [WARNING] not updating lockfile due to dry run
 ",
         )
@@ -1566,6 +1572,7 @@ fn update_with_missing_feature() {
         .with_stderr(
             "\
 [UPDATING] `[..]` index
+[NOTE] Pass `--verbose` to see 1 unchanged dependencies behind latest
 ",
         )
         .run();