fix(cli): Adjust terminal styles to match rustc

Fixes #12740

Author: epage

src/bin/cargo/cli.rs

@@ -163,7 +163,7 @@ fn print_list(gctx: &GlobalContext, is_verbose: bool) {
     ]);
     drop_println!(
         gctx,
-        color_print::cstr!("<green,bold>Installed Commands:</>")
+        color_print::cstr!("<bright-green,bold>Installed Commands:</>")
     );
     for (name, command) in list_commands(gctx) {
         let known_external_desc = known_external_command_descriptions.get(name.as_str());
@@ -557,11 +557,11 @@ pub fn cli(gctx: &GlobalContext) -> Command {
 
     let usage = if is_rustup() {
         color_print::cstr!(
-            "<cyan,bold>cargo</> <cyan>[+toolchain] [OPTIONS] [COMMAND]</>\n       <cyan,bold>cargo</> <cyan>[+toolchain] [OPTIONS]</> <cyan,bold>-Zscript</> <cyan><<MANIFEST_RS>> [ARGS]...</>"
+            "<bright-cyan,bold>cargo</> <bright-cyan>[+toolchain] [OPTIONS] [COMMAND]</>\n       <bright-cyan,bold>cargo</> <bright-cyan>[+toolchain] [OPTIONS]</> <bright-cyan,bold>-Zscript</> <bright-cyan><<MANIFEST_RS>> [ARGS]...</>"
         )
     } else {
         color_print::cstr!(
-            "<cyan,bold>cargo</> <cyan>[OPTIONS] [COMMAND]</>\n       <cyan,bold>cargo</> <cyan>[OPTIONS]</> <cyan,bold>-Zscript</> <cyan><<MANIFEST_RS>> [ARGS]...</>"
+            "<bright-cyan,bold>cargo</> <bright-cyan>[OPTIONS] [COMMAND]</>\n       <bright-cyan,bold>cargo</> <bright-cyan>[OPTIONS]</> <bright-cyan,bold>-Zscript</> <bright-cyan><<MANIFEST_RS>> [ARGS]...</>"
         )
     };
 
@@ -592,31 +592,31 @@ pub fn cli(gctx: &GlobalContext) -> Command {
             "\
 Rust's package manager
 
-<green,bold>Usage:</> {usage}
+<bright-green,bold>Usage:</> {usage}
 
-<green,bold>Options:</>
+<bright-green,bold>Options:</>
 {options}
 
-<green,bold>Commands:</>
-    <cyan,bold>build</>, <cyan,bold>b</>    Compile the current package
-    <cyan,bold>check</>, <cyan,bold>c</>    Analyze the current package and report errors, but don't build object files
-    <cyan,bold>clean</>       Remove the target directory
-    <cyan,bold>doc</>, <cyan,bold>d</>      Build this package's and its dependencies' documentation
-    <cyan,bold>new</>         Create a new cargo package
-    <cyan,bold>init</>        Create a new cargo package in an existing directory
-    <cyan,bold>add</>         Add dependencies to a manifest file
-    <cyan,bold>remove</>      Remove dependencies from a manifest file
-    <cyan,bold>run</>, <cyan,bold>r</>      Run a binary or example of the local package
-    <cyan,bold>test</>, <cyan,bold>t</>     Run the tests
-    <cyan,bold>bench</>       Run the benchmarks
-    <cyan,bold>update</>      Update dependencies listed in Cargo.lock
-    <cyan,bold>search</>      Search registry for crates
-    <cyan,bold>publish</>     Package and upload this package to the registry
-    <cyan,bold>install</>     Install a Rust binary
-    <cyan,bold>uninstall</>   Uninstall a Rust binary
-    <cyan>...</>         See all commands with <cyan,bold>--list</>
-
-See '<cyan,bold>cargo help</> <cyan><<command>></>' for more information on a specific command.\n",
+<bright-green,bold>Commands:</>
+    <bright-cyan,bold>build</>, <bright-cyan,bold>b</>    Compile the current package
+    <bright-cyan,bold>check</>, <bright-cyan,bold>c</>    Analyze the current package and report errors, but don't build object files
+    <bright-cyan,bold>clean</>       Remove the target directory
+    <bright-cyan,bold>doc</>, <bright-cyan,bold>d</>      Build this package's and its dependencies' documentation
+    <bright-cyan,bold>new</>         Create a new cargo package
+    <bright-cyan,bold>init</>        Create a new cargo package in an existing directory
+    <bright-cyan,bold>add</>         Add dependencies to a manifest file
+    <bright-cyan,bold>remove</>      Remove dependencies from a manifest file
+    <bright-cyan,bold>run</>, <bright-cyan,bold>r</>      Run a binary or example of the local package
+    <bright-cyan,bold>test</>, <bright-cyan,bold>t</>     Run the tests
+    <bright-cyan,bold>bench</>       Run the benchmarks
+    <bright-cyan,bold>update</>      Update dependencies listed in Cargo.lock
+    <bright-cyan,bold>search</>      Search registry for crates
+    <bright-cyan,bold>publish</>     Package and upload this package to the registry
+    <bright-cyan,bold>install</>     Install a Rust binary
+    <bright-cyan,bold>uninstall</>   Uninstall a Rust binary
+    <bright-cyan>...</>         See all commands with <bright-cyan,bold>--list</>
+
+See '<bright-cyan,bold>cargo help</> <bright-cyan><<command>></>' for more information on a specific command.\n",
         ))
         .arg(flag("version", "Print version info and exit").short('V'))
         .arg(flag("list", "List installed commands"))

src/bin/cargo/commands/add.rs

@@ -18,11 +18,11 @@ pub fn cli() -> Command {
         .about("Add dependencies to a Cargo.toml manifest file")
         .override_usage(
             color_print::cstr!("\
-       <cyan,bold>cargo add</> <cyan>[OPTIONS] <<DEP>>[@<<VERSION>>] ...</>
-       <cyan,bold>cargo add</> <cyan>[OPTIONS]</> <cyan,bold>--path</> <cyan><<PATH>> ...</>
-       <cyan,bold>cargo add</> <cyan>[OPTIONS]</> <cyan,bold>--git</> <cyan><<URL>> ...</>"
+       <bright-cyan,bold>cargo add</> <bright-cyan>[OPTIONS] <<DEP>>[@<<VERSION>>] ...</>
+       <bright-cyan,bold>cargo add</> <bright-cyan>[OPTIONS]</> <bright-cyan,bold>--path</> <bright-cyan><<PATH>> ...</>
+       <bright-cyan,bold>cargo add</> <bright-cyan>[OPTIONS]</> <bright-cyan,bold>--git</> <bright-cyan><<URL>> ...</>"
         ))
-        .after_help(color_print::cstr!("Run `<cyan,bold>cargo help add</>` for more detailed information.\n"))
+        .after_help(color_print::cstr!("Run `<bright-cyan,bold>cargo help add</>` for more detailed information.\n"))
         .group(clap::ArgGroup::new("selected").multiple(true).required(true))
         .args([
             clap::Arg::new("crates")

src/bin/cargo/commands/bench.rs

@@ -53,7 +53,7 @@ pub fn cli() -> Command {
         .arg_lockfile_path()
         .arg_ignore_rust_version()
         .after_help(color_print::cstr!(
-            "Run `<cyan,bold>cargo help bench</>` for more detailed information.\n"
+            "Run `<bright-cyan,bold>cargo help bench</>` for more detailed information.\n"
         ))
 }
 

src/bin/cargo/commands/build.rs

@@ -43,7 +43,7 @@ pub fn cli() -> Command {
         .arg_lockfile_path()
         .arg_ignore_rust_version()
         .after_help(color_print::cstr!(
-            "Run `<cyan,bold>cargo help build</>` for more detailed information.\n"
+            "Run `<bright-cyan,bold>cargo help build</>` for more detailed information.\n"
         ))
 }
 

src/bin/cargo/commands/check.rs

@@ -40,7 +40,7 @@ pub fn cli() -> Command {
         .arg_lockfile_path()
         .arg_ignore_rust_version()
         .after_help(color_print::cstr!(
-            "Run `<cyan,bold>cargo help check</>` for more detailed information.\n"
+            "Run `<bright-cyan,bold>cargo help check</>` for more detailed information.\n"
         ))
 }
 

src/bin/cargo/commands/clean.rs

@@ -122,7 +122,7 @@ pub fn cli() -> Command {
                 ),
         )
         .after_help(color_print::cstr!(
-            "Run `<cyan,bold>cargo help clean</>` for more detailed information.\n"
+            "Run `<bright-cyan,bold>cargo help clean</>` for more detailed information.\n"
         ))
 }
 

src/bin/cargo/commands/doc.rs

@@ -42,7 +42,7 @@ pub fn cli() -> Command {
         .arg_lockfile_path()
         .arg_ignore_rust_version()
         .after_help(color_print::cstr!(
-            "Run `<cyan,bold>cargo help doc</>` for more detailed information.\n"
+            "Run `<bright-cyan,bold>cargo help doc</>` for more detailed information.\n"
         ))
 }
 

src/bin/cargo/commands/fetch.rs

@@ -11,7 +11,7 @@ pub fn cli() -> Command {
         .arg_manifest_path()
         .arg_lockfile_path()
         .after_help(color_print::cstr!(
-            "Run `<cyan,bold>cargo help fetch</>` for more detailed information.\n"
+            "Run `<bright-cyan,bold>cargo help fetch</>` for more detailed information.\n"
         ))
 }
 

src/bin/cargo/commands/fix.rs

@@ -57,7 +57,7 @@ pub fn cli() -> Command {
         .arg_lockfile_path()
         .arg_ignore_rust_version()
         .after_help(color_print::cstr!(
-            "Run `<cyan,bold>cargo help fix</>` for more detailed information.\n"
+            "Run `<bright-cyan,bold>cargo help fix</>` for more detailed information.\n"
         ))
 }
 

src/bin/cargo/commands/generate_lockfile.rs

@@ -10,7 +10,7 @@ pub fn cli() -> Command {
         .arg_lockfile_path()
         .arg_ignore_rust_version_with_help("Ignore `rust-version` specification in packages")
         .after_help(color_print::cstr!(
-            "Run `<cyan,bold>cargo help generate-lockfile</>` for more detailed information.\n"
+            "Run `<bright-cyan,bold>cargo help generate-lockfile</>` for more detailed information.\n"
         ))
 }