From 1e7bad82fe0d2cdeeb59952d49e29d8cebc673c9 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 16 Oct 2025 11:27:26 -0500 Subject: [PATCH 1/2] refactor: Centralizee cargo-update styling --- src/cargo/ops/cargo_update.rs | 10 +++++----- src/cargo/util/style.rs | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/cargo/ops/cargo_update.rs b/src/cargo/ops/cargo_update.rs index cafd0057788..9b60d3dfd29 100644 --- a/src/cargo/ops/cargo_update.rs +++ b/src/cargo/ops/cargo_update.rs @@ -1058,11 +1058,11 @@ impl PackageChangeKind { pub fn style(&self) -> anstyle::Style { match self { - Self::Added => style::NOTE, - Self::Removed => style::ERROR, - Self::Upgraded => style::GOOD, - Self::Downgraded => style::WARN, - Self::Unchanged => anstyle::Style::new().bold(), + Self::Added => style::UPDATE_ADDED, + Self::Removed => style::UPDATE_REMOVED, + Self::Upgraded => style::UPDATE_UPGRADED, + Self::Downgraded => style::UPDATE_DOWNGRADED, + Self::Unchanged => style::UPDATE_UNCHANGED, } } } diff --git a/src/cargo/util/style.rs b/src/cargo/util/style.rs index 24e66952170..cf677b557f4 100644 --- a/src/cargo/util/style.rs +++ b/src/cargo/util/style.rs @@ -12,3 +12,9 @@ pub const GOOD: Style = AnsiColor::BrightGreen.on_default().effects(Effects::BOL pub const VALID: Style = AnsiColor::BrightCyan.on_default().effects(Effects::BOLD); pub const INVALID: Style = annotate_snippets::renderer::DEFAULT_WARNING_STYLE; pub const TRANSIENT: Style = annotate_snippets::renderer::DEFAULT_HELP_STYLE; + +pub const UPDATE_ADDED: Style = NOTE; +pub const UPDATE_REMOVED: Style = ERROR; +pub const UPDATE_UPGRADED: Style = GOOD; +pub const UPDATE_DOWNGRADED: Style = WARN; +pub const UPDATE_UNCHANGED: Style = anstyle::Style::new().bold(); From 6bbe2cb3285f7d0effbe266cb48165a04775fe0c Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 16 Oct 2025 11:31:24 -0500 Subject: [PATCH 2/2] refactor: Centralizee cargo-tree styling --- src/cargo/ops/tree/mod.rs | 13 +++++-------- src/cargo/util/style.rs | 11 +++++++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/cargo/ops/tree/mod.rs b/src/cargo/ops/tree/mod.rs index c4b0efa00ae..4344daa49e7 100644 --- a/src/cargo/ops/tree/mod.rs +++ b/src/cargo/ops/tree/mod.rs @@ -8,6 +8,7 @@ use crate::core::{Package, PackageId, PackageIdSpec, PackageIdSpecQuery, Workspa use crate::ops::resolve::SpecsAndResolvedFeatures; use crate::ops::{self, Packages}; use crate::util::CargoResult; +use crate::util::style; use crate::{drop_print, drop_println}; use anyhow::Context as _; use graph::Graph; @@ -477,13 +478,9 @@ fn print_dependencies<'a>( fn edge_line_color(kind: EdgeKind) -> anstyle::Style { match kind { - EdgeKind::Dep(DepKind::Normal) => anstyle::Style::new() | anstyle::Effects::DIMMED, - EdgeKind::Dep(DepKind::Build) => { - anstyle::AnsiColor::Blue.on_default() | anstyle::Effects::BOLD - } - EdgeKind::Dep(DepKind::Development) => { - anstyle::AnsiColor::Cyan.on_default() | anstyle::Effects::BOLD - } - EdgeKind::Feature => anstyle::AnsiColor::Magenta.on_default() | anstyle::Effects::DIMMED, + EdgeKind::Dep(DepKind::Normal) => style::DEP_NORMAL, + EdgeKind::Dep(DepKind::Build) => style::DEP_BUILD, + EdgeKind::Dep(DepKind::Development) => style::DEP_DEV, + EdgeKind::Feature => style::DEP_FEATURE, } } diff --git a/src/cargo/util/style.rs b/src/cargo/util/style.rs index cf677b557f4..81ed6b4d3fc 100644 --- a/src/cargo/util/style.rs +++ b/src/cargo/util/style.rs @@ -18,3 +18,14 @@ pub const UPDATE_REMOVED: Style = ERROR; pub const UPDATE_UPGRADED: Style = GOOD; pub const UPDATE_DOWNGRADED: Style = WARN; pub const UPDATE_UNCHANGED: Style = anstyle::Style::new().bold(); + +pub const DEP_NORMAL: Style = anstyle::Style::new().effects(anstyle::Effects::DIMMED); +pub const DEP_BUILD: Style = anstyle::AnsiColor::Blue + .on_default() + .effects(anstyle::Effects::BOLD); +pub const DEP_DEV: Style = anstyle::AnsiColor::Cyan + .on_default() + .effects(anstyle::Effects::BOLD); +pub const DEP_FEATURE: Style = anstyle::AnsiColor::Magenta + .on_default() + .effects(anstyle::Effects::DIMMED);