refactor: Migrate to anstyle for color definitions

Author: epage

Cargo.lock

@@ -42,6 +42,7 @@ test = ["dep:snapbox", "dep:walkdir"]
 # Sorted by alphabetic order
 [dependencies]
 anstyle = "1.0.11"
+anstyle-termcolor = "1.1.4"
 anyhow = "1.0.69"
 cfg-if = "1.0"
 chrono = { version = "0.4", default-features = false, features = ["std"] }

Cargo.toml

@@ -7,9 +7,9 @@ use std::path::{Path, PathBuf};
 use std::sync::LazyLock;
 use std::{cmp, env};
 
+use anstyle::AnsiColor;
 use anyhow::{Context, Result, anyhow};
 use git_testament::{git_testament, render_testament};
-use termcolor::Color;
 use tracing::{error, info, warn};
 use tracing_subscriber::{EnvFilter, Registry, reload::Handle};
 
@@ -152,10 +152,10 @@ fn show_channel_updates(
 ) -> Result<()> {
     let data = updates.into_iter().map(|(pkg, result)| {
         let (banner, color) = match &result {
-            Ok(UpdateStatus::Installed) => ("installed", Some(Color::Green)),
-            Ok(UpdateStatus::Updated(_)) => ("updated", Some(Color::Green)),
+            Ok(UpdateStatus::Installed) => ("installed", Some(AnsiColor::Green)),
+            Ok(UpdateStatus::Updated(_)) => ("updated", Some(AnsiColor::Green)),
             Ok(UpdateStatus::Unchanged) => ("unchanged", None),
-            Err(_) => ("update failed", Some(Color::Red)),
+            Err(_) => ("update failed", Some(AnsiColor::Red)),
         };
 
         let (previous_version, version) = match &pkg {

src/cli/common.rs

@@ -1,8 +1,8 @@
 // Write Markdown to the terminal
 use std::io::Write;
 
+use anstyle::AnsiColor;
 use pulldown_cmark::{Event, Tag, TagEnd};
-use termcolor::Color;
 
 use crate::process::{Attr, ColorableTerminal};
 
@@ -151,7 +151,7 @@ impl<'a> LineFormatter<'a> {
                 self.wrapper.write_line();
             }
             Tag::Emphasis => {
-                self.push_attr(Attr::ForegroundColor(Color::Red));
+                self.push_attr(Attr::ForegroundColor(AnsiColor::Red));
             }
             Tag::Strong => {}
             Tag::Strikethrough => {}

src/cli/markdown.rs

@@ -40,14 +40,14 @@ use std::process::Command;
 use std::str::FromStr;
 use std::{fmt, fs};
 
+use anstyle::AnsiColor;
 use anyhow::{Context, Result, anyhow};
 use cfg_if::cfg_if;
 use clap::ValueEnum;
 use clap::builder::PossibleValue;
 use itertools::Itertools;
 use same_file::Handle;
 use serde::{Deserialize, Serialize};
-use termcolor::Color;
 use tracing::{error, info, trace, warn};
 
 use crate::dist::download::DownloadCfg;
@@ -1368,13 +1368,13 @@ pub(crate) async fn check_rustup_update(dl_cfg: &DownloadCfg<'_>) -> anyhow::Res
     write!(t.lock(), "rustup - ")?;
 
     Ok(if current_version != available_version {
-        let _ = t.fg(Color::Yellow);
+        let _ = t.fg(AnsiColor::Yellow);
         write!(t.lock(), "Update available")?;
         let _ = t.reset();
         writeln!(t.lock(), " : {current_version} -> {available_version}")?;
         true
     } else {
-        let _ = t.fg(Color::Green);
+        let _ = t.fg(AnsiColor::Green);
         write!(t.lock(), "Up to date")?;
         let _ = t.reset();
         writeln!(t.lock(), " : {current_version}")?;

src/cli/self_update.rs

@@ -9,7 +9,10 @@ use std::{
     sync::{Arc, Mutex, MutexGuard},
 };
 
-use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, StandardStreamLock, WriteColor};
+use anstyle::AnsiColor;
+use anstyle_termcolor::to_termcolor_color;
+use termcolor::ColorChoice;
+use termcolor::{ColorSpec, StandardStream, StandardStreamLock, WriteColor};
 
 use super::Process;
 #[cfg(feature = "test")]
@@ -108,10 +111,10 @@ impl ColorableTerminal {
         }
     }
 
-    pub fn fg(&mut self, color: Color) -> io::Result<()> {
+    pub fn fg(&mut self, color: AnsiColor) -> io::Result<()> {
         match self.inner.lock().unwrap().deref_mut() {
             TerminalInner::StandardStream(s, spec) => {
-                spec.set_fg(Some(color));
+                spec.set_fg(Some(to_termcolor_color(color.into())));
                 s.set_color(spec)
             }
             #[cfg(feature = "test")]
@@ -124,7 +127,9 @@ impl ColorableTerminal {
             TerminalInner::StandardStream(s, spec) => {
                 match attr {
                     Attr::Bold => spec.set_bold(true),
-                    Attr::ForegroundColor(color) => spec.set_fg(Some(color)),
+                    Attr::ForegroundColor(color) => {
+                        spec.set_fg(Some(to_termcolor_color(color.into())))
+                    }
                 };
                 s.set_color(spec)
             }
@@ -356,7 +361,7 @@ impl StreamSelector {
 #[derive(Copy, Clone, Debug)]
 pub enum Attr {
     Bold,
-    ForegroundColor(Color),
+    ForegroundColor(AnsiColor),
 }
 
 #[cfg(test)]