Auto merge of #14554 - Rustin170506:rustin-patch-notes, r=epage

refactor(info): Use the `shell.note` to print the note

Author: bors

src/cargo/ops/registry/info/view.rs

@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 use std::io::Write;
 
+use crate::core::Shell;
 use crate::util::style::{ERROR, HEADER, LITERAL, NOP, NOTE, WARN};
 use crate::{
     core::{
@@ -153,7 +154,7 @@ pub(super) fn pretty_view(
     )?;
 
     if suggest_cargo_tree_command {
-        suggest_cargo_tree(package_id, stdout)?;
+        suggest_cargo_tree(package_id, &mut shell)?;
     }
 
     Ok(())
@@ -395,23 +396,14 @@ fn pretty_features(
 }
 
 // Suggest the cargo tree command to view the dependency tree.
-fn suggest_cargo_tree(package_id: PackageId, stdout: &mut dyn Write) -> CargoResult<()> {
+fn suggest_cargo_tree(package_id: PackageId, shell: &mut Shell) -> CargoResult<()> {
     let literal = LITERAL;
 
-    note(format_args!(
+    shell.note(format_args!(
         "to see how you depend on {name}, run `{literal}cargo tree --invert --package {name}@{version}{literal:#}`",
         name = package_id.name(),
         version = package_id.version(),
-    ), stdout)
-}
-
-pub(super) fn note(msg: impl std::fmt::Display, stdout: &mut dyn Write) -> CargoResult<()> {
-    let note = NOTE;
-    let bold = anstyle::Style::new() | anstyle::Effects::BOLD;
-
-    writeln!(stdout, "{note}note{note:#}{bold}:{bold:#} {msg}",)?;
-
-    Ok(())
+    ))
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]

tests/testsuite/cargo_info/specify_version_within_ws_and_match_with_lockfile/stderr.term.svg

@@ -48,15 +48,15 @@ fn case() {
         .current_dir(transitive1_directory)
         .assert()
         .stdout_eq(file!["transitive1-stdout.term.svg"])
-        .stderr_eq("");
+        .stderr_eq(file!["transitive1-stderr.term.svg"]);
     snapbox::cmd::Command::cargo_ui()
         .arg("info")
         .arg("my-package")
         .arg("--registry=dummy-registry")
         .current_dir(transitive2_directory)
         .assert()
         .stdout_eq(file!["transitive2-stdout.term.svg"])
-        .stderr_eq("");
+        .stderr_eq(file!["transitive2-stderr.term.svg"]);
     snapbox::cmd::Command::cargo_ui()
         .arg("info")
         .arg("my-package")
@@ -72,7 +72,7 @@ fn case() {
         .current_dir(direct2_directory)
         .assert()
         .stdout_eq(file!["direct2-stdout.term.svg"])
-        .stderr_eq("");
+        .stderr_eq(file!["direct2-stderr.term.svg"]);
 
     assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }