feat(cli): Add color to clap help/errors

Author: epage

Cargo.lock

@@ -37,7 +37,7 @@ otel = [
 ]
 
 # Exports code dependent on private interfaces for the integration test suite
-test = ["dep:snapbox", "dep:walkdir"]
+test = ["dep:snapbox", "dep:walkdir", "clap-cargo/testing_colors"]
 
 # Sorted by alphabetic order
 [dependencies]
@@ -47,6 +47,7 @@ anyhow = "1.0.69"
 cfg-if = "1.0"
 chrono = { version = "0.4", default-features = false, features = ["std"] }
 clap = { version = "4", features = ["derive", "wrap_help"] }
+clap-cargo = "0.18.2"
 clap_complete = "4"
 console = "0.16"
 curl = { version = "0.4.44", optional = true }

Cargo.toml

@@ -75,6 +75,7 @@ fn handle_epipe(res: Result<ExitCode>) -> Result<ExitCode> {
     version = common::version(),
     before_help = format!("rustup {}", common::version()),
     after_help = rustup_help(),
+    styles = clap_cargo::style::CLAP_STYLING,
 )]
 struct Rustup {
     /// Set log level to 'DEBUG' if 'RUSTUP_LOG' is unset
@@ -578,11 +579,11 @@ pub async fn main(
     let matches = match Rustup::try_parse_from(process.args_os()) {
         Ok(matches) => matches,
         Err(err) if err.kind() == DisplayHelp => {
-            write!(process.stdout().lock(), "{err}")?;
+            write!(process.stdout().lock(), "{}", err.render().ansi())?;
             return Ok(ExitCode(0));
         }
         Err(err) if err.kind() == DisplayVersion => {
-            write!(process.stdout().lock(), "{err}")?;
+            write!(process.stdout().lock(), "{}", err.render().ansi())?;
             display_version(current_dir, process).await?;
             return Ok(ExitCode(0));
         }
@@ -594,9 +595,9 @@ pub async fn main(
             ]
             .contains(&err.kind())
             {
-                write!(process.stdout().lock(), "{err}")?;
+                write!(process.stdout().lock(), "{}", err.render().ansi())?;
             } else {
-                write!(process.stderr().lock(), "{err}")?;
+                write!(process.stderr().lock(), "{}", err.render().ansi())?;
             }
             return Ok(ExitCode(1));
         }
@@ -609,7 +610,7 @@ pub async fn main(
 
     let Some(subcmd) = matches.subcmd else {
         let help = Rustup::command().render_long_help();
-        writeln!(process.stderr().lock(), "{help}")?;
+        writeln!(process.stderr().lock(), "{}", help.ansi())?;
         return Ok(ExitCode(1));
     };
 

src/cli/rustup_mode.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use anyhow::Result;
+use anyhow::{Result, format_err};
 use clap::Parser;
 use tracing::warn;
 use tracing_subscriber::{EnvFilter, Registry, reload::Handle};
@@ -24,6 +24,7 @@ use crate::{
     bin_name = "rustup-init[EXE]",
     version = common::version(),
     before_help = format!("rustup-init {}", common::version()),
+    styles = clap_cargo::style::CLAP_STYLING
 )]
 struct RustupInit {
     /// Set log level to 'DEBUG' if 'RUSTUP_LOG' is unset
@@ -99,10 +100,10 @@ pub async fn main(
         Ok(args) => args,
         Err(e) if [ErrorKind::DisplayHelp, ErrorKind::DisplayVersion].contains(&e.kind()) => {
             use std::io::Write as _;
-            write!(process.stdout().lock(), "{e}")?;
+            write!(process.stdout().lock(), "{}", e.render().ansi())?;
             return Ok(utils::ExitCode(0));
         }
-        Err(e) => return Err(e.into()),
+        Err(e) => return Err(format_err!("{}", e.render().ansi())),
     };
 
     if self_replace {