fix(cli): Adjust terminal styles to match rustc

Fixes #12740

Author: epage

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

@@ -2,7 +2,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::util::style::{ERROR, HEADER, LITERAL, NOP, WARN};
 use crate::{
     CargoResult, GlobalContext,
     core::{
@@ -26,7 +26,7 @@ pub(super) fn pretty_view(
     let header = HEADER;
     let error = ERROR;
     let warn = WARN;
-    let note = NOTE;
+    let context = annotate_snippets::renderer::DEFAULT_CONTEXT_STYLE;
 
     let mut shell = gctx.shell();
     let verbosity = shell.verbosity();
@@ -45,7 +45,7 @@ pub(super) fn pretty_view(
         } else {
             format!("#{}", metadata.keywords.join(" #"))
         };
-        write!(shell.out(), " {note}{message}{note:#}")?;
+        write!(shell.out(), " {context}{message}{context:#}")?;
     }
 
     let stdout = shell.out();
@@ -68,7 +68,7 @@ pub(super) fn pretty_view(
         (Some(latest), false) if latest.as_summary().version() != package_id.version() => {
             write!(
                 stdout,
-                " {warn}(latest {} {warn:#}{note}from {}{note:#}{warn}){warn:#}",
+                " {warn}(latest {} {warn:#}{context}from {}{context:#}{warn}){warn:#}",
                 latest.as_summary().version(),
                 pretty_source(summary.source_id(), gctx)
             )?;
@@ -83,7 +83,7 @@ pub(super) fn pretty_view(
         (_, false) => {
             write!(
                 stdout,
-                " {note}(from {}){note:#}",
+                " {context}(from {}){context:#}",
                 pretty_source(summary.source_id(), gctx)
             )?;
         }

src/cargo/util/style.rs

@@ -1,13 +1,13 @@
 use anstyle::*;
 
 pub const NOP: Style = Style::new();
-pub const HEADER: Style = AnsiColor::Green.on_default().effects(Effects::BOLD);
-pub const USAGE: Style = AnsiColor::Green.on_default().effects(Effects::BOLD);
-pub const LITERAL: Style = AnsiColor::Cyan.on_default().effects(Effects::BOLD);
-pub const PLACEHOLDER: Style = AnsiColor::Cyan.on_default();
-pub const ERROR: Style = AnsiColor::Red.on_default().effects(Effects::BOLD);
-pub const WARN: Style = AnsiColor::Yellow.on_default().effects(Effects::BOLD);
-pub const NOTE: Style = AnsiColor::Cyan.on_default().effects(Effects::BOLD);
-pub const GOOD: Style = AnsiColor::Green.on_default().effects(Effects::BOLD);
-pub const VALID: Style = AnsiColor::Cyan.on_default().effects(Effects::BOLD);
-pub const INVALID: Style = AnsiColor::Yellow.on_default().effects(Effects::BOLD);
+pub const HEADER: Style = AnsiColor::BrightGreen.on_default().effects(Effects::BOLD);
+pub const USAGE: Style = AnsiColor::BrightGreen.on_default().effects(Effects::BOLD);
+pub const LITERAL: Style = AnsiColor::BrightCyan.on_default().effects(Effects::BOLD);
+pub const PLACEHOLDER: Style = AnsiColor::BrightCyan.on_default();
+pub const ERROR: Style = annotate_snippets::renderer::DEFAULT_ERROR_STYLE;
+pub const WARN: Style = annotate_snippets::renderer::DEFAULT_WARNING_STYLE;
+pub const NOTE: Style = annotate_snippets::renderer::DEFAULT_NOTE_STYLE;
+pub const GOOD: Style = AnsiColor::BrightGreen.on_default().effects(Effects::BOLD);
+pub const VALID: Style = AnsiColor::BrightCyan.on_default().effects(Effects::BOLD);
+pub const INVALID: Style = annotate_snippets::renderer::DEFAULT_WARNING_STYLE;