Try using multiple groups in a report

jneem · jneem · commit 7a38ef274671 · 2025-10-07T17:40:57.000-05:00
diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs
@@ -22,7 +22,7 @@ use crate::sources::source::SourceMap;
 use crate::util::errors::CargoResult;
 use crate::util::interning::InternedString;
 use crate::util::{CanonicalUrl, GlobalContext};
-use annotate_snippets::Level;
+use annotate_snippets::{Group, Level};
 use anyhow::{Context as _, bail};
 use tracing::{debug, trace};
 use url::Url;
@@ -389,16 +389,17 @@ impl<'gctx> PackageRegistry<'gctx> {
                 }
                 if !unused_fields.is_empty() {
                     self.source_config.gctx().shell().print_report(
-                        &[Level::WARNING
-                            .primary_title(format!(
+                        &[
+                            Group::with_title(Level::WARNING.secondary_title(format!(
                                 "unused field in patch for `{}`: {}",
                                 dep.package_name(),
                                 unused_fields.join(", ")
-                            ))
-                            .element(Level::NOTE.message(format!(
+                            ))),
+                            Group::with_title(Level::NOTE.secondary_title(format!(
                                 "configure {} in the `dependencies` entry",
                                 unused_fields.join(", ")
-                            )))],
+                            ))),
+                        ],
                         false,
                     )?;
                 }
diff --git a/src/cargo/ops/cargo_package/vcs.rs b/src/cargo/ops/cargo_package/vcs.rs
@@ -4,7 +4,7 @@ use crate::core::{Package, Workspace};
 use crate::ops::PackageOpts;
 use crate::sources::PathEntry;
 use crate::{CargoResult, GlobalContext};
-use annotate_snippets::Level;
+use annotate_snippets::{Group, Level};
 use anyhow::Context;
 use cargo_util::paths;
 use gix::bstr::ByteSlice;
@@ -164,22 +164,21 @@ fn warn_symlink_checked_out_as_plain_text_file(
             repo.workdir().unwrap().display()
         );
         let mut notes = vec![
-            Level::NOTE.message(
+            Group::with_title(Level::WARNING.secondary_title(msg)),
+            Group::with_title(Level::NOTE.secondary_title(
                 "this might cause the `.crate` file to include incorrect or incomplete files",
+            )),
+            Group::with_title(
+                Level::HELP
+                    .secondary_title("to avoid this, set the Git config `core.symlinks` to `true`"),
             ),
-            Level::HELP.message("to avoid this, set the Git config `core.symlinks` to `true`"),
         ];
         if cfg!(windows) {
-            notes.push(
-                Level::HELP.message("on Windows, enable the Developer Mode to support symlinks"),
-            );
+            notes.push(Group::with_title(Level::HELP.secondary_title(
+                "on Windows, enable the Developer Mode to support symlinks",
+            )));
         };
-        gctx.shell().print_report(
-            &[Level::WARNING
-                .secondary_title(msg)
-                .elements(notes.into_iter())],
-            false,
-        )?;
+        gctx.shell().print_report(&notes, false)?;
     }
 
     Ok(())
diff --git a/src/cargo/sources/registry/mod.rs b/src/cargo/sources/registry/mod.rs
@@ -191,7 +191,7 @@ use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::task::{Poll, ready};
 
-use annotate_snippets::Level;
+use annotate_snippets::{Group, Level};
 use anyhow::Context as _;
 use cargo_util::paths::{self, exclude_from_backups_and_indexing};
 use flate2::read::GzDecoder;
@@ -834,14 +834,14 @@ impl<'gctx> Source for RegistrySource<'gctx> {
                 if self.selected_precise_yanked.insert((name, version.clone())) {
                     let mut shell = self.gctx.shell();
                     shell.print_report(
-                        &[Level::WARNING
-                            .primary_title(format!(
+                        &[
+                            Group::with_title(Level::WARNING.secondary_title(format!(
                                 "selected package `{name}@{version}` was yanked by the author"
-                            ))
-                            .element(
-                                Level::NOTE
-                                    .message("if possible, try a compatible non-yanked version"),
-                            )],
+                            ))),
+                            Group::with_title(Level::NOTE.secondary_title(
+                                "if possible, try a compatible non-yanked version",
+                            )),
+                        ],
                         false,
                     )?;
                 }
diff --git a/src/cargo/util/context/mod.rs b/src/cargo/util/context/mod.rs
@@ -79,7 +79,7 @@ use crate::util::network::http::configure_http_handle;
 use crate::util::network::http::http_handle;
 use crate::util::{CanonicalUrl, closest_msg, internal};
 use crate::util::{Filesystem, IntoUrl, IntoUrlWithBase, Rustc};
-use annotate_snippets::Level;
+use annotate_snippets::{Group, Level};
 use anyhow::{Context as _, anyhow, bail, format_err};
 use cargo_credential::Secret;
 use cargo_util::paths;
@@ -1584,13 +1584,15 @@ impl GlobalContext {
                     }
                 } else {
                     self.shell().print_report(&[
-                        Level::WARNING.primary_title(
-                        format!(
-                        "`{}` is deprecated in favor of `{filename_without_extension}.toml`",
-                        possible.display(),
-                    )).element(Level::NOTE.message(
-                        format!("if you need to support cargo 1.38 or earlier, you can symlink `{filename_without_extension}` to `{filename_without_extension}.toml`")))
-
+                        Group::with_title(
+                            Level::WARNING.secondary_title(format!(
+                                "`{}` is deprecated in favor of `{filename_without_extension}.toml`",
+                                possible.display(),
+                            )
+                        )),
+                        Group::with_title(Level::NOTE.secondary_title(
+                            format!("if you need to support cargo 1.38 or earlier, you can symlink `{filename_without_extension}` to `{filename_without_extension}.toml`")
+                        ))
                     ], false)?;
                 }
             }
diff --git a/tests/testsuite/config.rs b/tests/testsuite/config.rs
@@ -294,8 +294,7 @@ f1 = 1
     let output = read_output(gctx);
     let expected = str![[r#"
 [WARNING] `[ROOT]/.cargo/config` is deprecated in favor of `config.toml`
-  |
-  = [NOTE] if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml`
+[NOTE] if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml`
 
 "#]];
     assert_e2e().eq(&output, expected);
@@ -315,8 +314,7 @@ f1 = 1
     p.cargo("-vV")
         .with_stderr_data(str![[r#"
 [WARNING] `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml`
-  |
-  = [NOTE] if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml`
+[NOTE] if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml`
 
 "#]])
         .run();
diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs
@@ -7450,9 +7450,8 @@ fn git_core_symlinks_false() {
     p.cargo("package --allow-dirty")
         .with_stderr_data(str![[r#"
 [WARNING] found symbolic links that may be checked out as regular files for git repo at `[ROOT]/foo/`
-  |
-  = [NOTE] this might cause the `.crate` file to include incorrect or incomplete files
-  = [HELP] to avoid this, set the Git config `core.symlinks` to `true`
+[NOTE] this might cause the `.crate` file to include incorrect or incomplete files
+[HELP] to avoid this, set the Git config `core.symlinks` to `true`
 ...
 [PACKAGING] bar v0.0.0 ([ROOT]/foo)
 [PACKAGED] 7 files, [FILE_SIZE]B ([FILE_SIZE]B compressed)
diff --git a/tests/testsuite/patch.rs b/tests/testsuite/patch.rs
@@ -931,8 +931,7 @@ fn add_patch_with_features() {
     p.cargo("check")
         .with_stderr_data(str![[r#"
 [WARNING] unused field in patch for `bar`: `features`
-  |
-  = [NOTE] configure `features` in the `dependencies` entry
+[NOTE] configure `features` in the `dependencies` entry
 [UPDATING] `dummy-registry` index
 [LOCKING] 1 package to latest compatible version
 [CHECKING] bar v0.1.0 ([ROOT]/foo/bar)
@@ -944,8 +943,7 @@ fn add_patch_with_features() {
     p.cargo("check")
         .with_stderr_data(str![[r#"
 [WARNING] unused field in patch for `bar`: `features`
-  |
-  = [NOTE] configure `features` in the `dependencies` entry
+[NOTE] configure `features` in the `dependencies` entry
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 
 "#]])
@@ -981,8 +979,7 @@ fn add_patch_with_setting_default_features() {
     p.cargo("check")
         .with_stderr_data(str![[r#"
 [WARNING] unused field in patch for `bar`: `features`, `default-features`
-  |
-  = [NOTE] configure `features`, `default-features` in the `dependencies` entry
+[NOTE] configure `features`, `default-features` in the `dependencies` entry
 [UPDATING] `dummy-registry` index
 [LOCKING] 1 package to latest compatible version
 [CHECKING] bar v0.1.0 ([ROOT]/foo/bar)
@@ -994,8 +991,7 @@ fn add_patch_with_setting_default_features() {
     p.cargo("check")
         .with_stderr_data(str![[r#"
 [WARNING] unused field in patch for `bar`: `features`, `default-features`
-  |
-  = [NOTE] configure `features`, `default-features` in the `dependencies` entry
+[NOTE] configure `features`, `default-features` in the `dependencies` entry
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 
 "#]])
diff --git a/tests/testsuite/update.rs b/tests/testsuite/update.rs
@@ -1438,8 +1438,7 @@ fn precise_yanked() {
         .with_stderr_data(str![[r#"
 [UPDATING] `dummy-registry` index
 [WARNING] selected package `bar@0.1.1` was yanked by the author
-  |
-  = [NOTE] if possible, try a compatible non-yanked version
+[NOTE] if possible, try a compatible non-yanked version
 [UPDATING] bar v0.1.0 -> v0.1.1
 
 "#]])
@@ -1479,8 +1478,7 @@ fn precise_yanked_multiple_presence() {
         .with_stderr_data(str![[r#"
 [UPDATING] `dummy-registry` index
 [WARNING] selected package `bar@0.1.1` was yanked by the author
-  |
-  = [NOTE] if possible, try a compatible non-yanked version
+[NOTE] if possible, try a compatible non-yanked version
 [UPDATING] bar v0.1.0 -> v0.1.1
 
 "#]])
