new: simplified --color option (#220)

pamburus · Apr 30, 2024 · 17544f2 · 17544f2
1 parent c0ca897
commit 17544f2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ members = [".", "crate/encstr"]
 [workspace.package]
 repository = "https://github.com/pamburus/hl"
 authors = ["Pavel Ivanov <mr.pavel.ivanov@gmail.com>"]
-version = "0.28.1-alpha.3"
+version = "0.28.1-alpha.4"
 edition = "2021"
 license = "MIT"
 

diff --git a/README.md b/README.md
@@ -458,8 +458,7 @@ Arguments:
   [FILE]...  Files to process
 
 Options:
-      --color <COLOR>                                    Color output options [env: HL_COLOR=] [default: auto] [possible values: auto, always, never]
-  -c                                                     Handful alias for --color=always, overrides --color option
+  -c, --color [<COLOR>]                                  Color output options [env: HL_COLOR=] [default: auto] [possible values: auto, always, never]
       --paging <PAGING>                                  Output paging options [env: HL_PAGING=] [default: auto] [possible values: auto, always, never]
   -P                                                     Handful alias for --paging=never, overrides --paging option
       --theme <THEME>                                    Color theme [env: HL_THEME=] [default: universal]

diff --git a/src/cli.rs b/src/cli.rs
@@ -20,14 +20,10 @@ use crate::{
 #[clap(version, disable_help_flag = true)]
 pub struct Opt {
     /// Color output options.
-    #[arg(long, default_value = "auto", env = "HL_COLOR", overrides_with = "color")]
+    #[arg(long, short, default_value = "auto", env = "HL_COLOR", overrides_with = "color", default_missing_value = "always", num_args = 0..=1)]
     #[arg(value_enum)]
     pub color: ColorOption,
 
-    /// Handful alias for --color=always, overrides --color option.
-    #[arg(short)]
-    pub color_always: bool,
-
     /// Output paging options.
     #[arg(long, default_value = "auto", env = "HL_PAGING", overrides_with = "paging")]
     #[arg(value_enum)]

diff --git a/src/main.rs b/src/main.rs
@@ -59,12 +59,7 @@ fn run() -> Result<()> {
     };
 
     // Configure color scheme.
-    let color = if opt.color_always {
-        cli::ColorOption::Always
-    } else {
-        opt.color
-    };
-    let use_colors = match color {
+    let use_colors = match opt.color {
         cli::ColorOption::Auto => stdout().is_terminal() && color_supported,
         cli::ColorOption::Always => true,
         cli::ColorOption::Never => false,