tidyup: Reduce unnecessary complexity in terminal styling

crazyscot · Dec 26, 2024 · 1194c24 · 1194c24
1 parent b54ee50
commit 1194c24
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 53 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,7 +27,6 @@ rustls-log = ["quinn/rustls-log"]
 [dependencies]
 anstream = "0.6.18"
 anstyle = "1.0.10"
-anstyle-owo-colors = "2.0.3"
 anyhow = "1.0.94"
 capnp = "0.20.3"
 capnp-futures = "0.20.1"
@@ -48,7 +47,6 @@ humanize-rs = "0.1.5"
 indicatif = { version = "0.17.9", features = ["tokio"] }
 lazy_static = "1.5.0"
 num-format = { version = "0.4.4" }
-owo-colors = { version = "4.1.0", features = ["supports-color"] }
 quinn = { version = "0.11.6", default-features = false, features = ["runtime-tokio", "rustls", "ring"] }
 rcgen = { version = "0.13.1" }
 rustls-pki-types = "1.10.0"

diff --git a/src/cli/cli_main.rs b/src/cli/cli_main.rs
@@ -3,7 +3,7 @@
 
 use std::process::ExitCode;
 
-use super::{args::CliArgs, styles::ERROR_S};
+use super::args::CliArgs;
 use crate::{
     client::{client_main, Parameters as ClientParameters, MAX_UPDATE_FPS},
     config::{Configuration, Manager},
@@ -14,7 +14,6 @@ use crate::{
 
 use anstream::{eprintln, println};
 use indicatif::{MultiProgress, ProgressDrawTarget};
-use owo_colors::OwoColorize as _;
 use tracing::error_span;
 
 /// Computes the trace level for a given set of [ClientParameters]
@@ -59,15 +58,15 @@ pub async fn cli() -> anyhow::Result<ExitCode> {
     let config_manager = match Manager::try_from(&args) {
         Ok(m) => m,
         Err(err) => {
-            eprintln!("{}: {err}", "ERROR".style(*ERROR_S));
+            eprintln!("ERROR: {err}");
             return Ok(ExitCode::FAILURE);
         }
     };
 
     let config = match config_manager.get::<Configuration>() {
         Ok(c) => c,
         Err(err) => {
-            eprintln!("{}: Failed to parse configuration", "ERROR".style(*ERROR_S));
+            eprintln!("ERROR: Failed to parse configuration");
             err.into_iter().for_each(|e| eprintln!("{e}"));
             return Ok(ExitCode::FAILURE);
         }

diff --git a/src/cli/styles.rs b/src/cli/styles.rs
@@ -6,23 +6,13 @@
 #[allow(clippy::enum_glob_use)]
 use anstyle::AnsiColor::*;
 use anstyle::Color::Ansi;
-use anstyle_owo_colors::to_owo_style;
 use clap::builder::styling::Styles;
-use lazy_static::lazy_static;
-use owo_colors::Style as OwoStyle;
 
 pub(crate) const ERROR: anstyle::Style = anstyle::Style::new().bold().fg_color(Some(Ansi(Red)));
 pub(crate) const WARNING: anstyle::Style =
     anstyle::Style::new().bold().fg_color(Some(Ansi(Yellow)));
 pub(crate) const INFO: anstyle::Style = anstyle::Style::new().fg_color(Some(Ansi(Cyan)));
-pub(crate) const DEBUG: anstyle::Style = anstyle::Style::new().fg_color(Some(Ansi(Blue)));
-
-lazy_static! {
-    pub(crate) static ref ERROR_S: OwoStyle = to_owo_style(ERROR);
-    pub(crate) static ref WARNING_S: OwoStyle = to_owo_style(WARNING);
-    pub(crate) static ref INFO_S: OwoStyle = to_owo_style(INFO);
-    pub(crate) static ref DEBUG_S: OwoStyle = to_owo_style(DEBUG);
-}
+// pub(crate) const DEBUG: anstyle::Style = anstyle::Style::new().fg_color(Some(Ansi(Blue)));
 
 pub(crate) const CALL_OUT: anstyle::Style = anstyle::Style::new()
     .underline()