Merge pull request #2651 from AbyssAbuse/master

Make colorizer respect `AppSettings::ColorAlways` / `ColorChoice::Always`
clap-rs · Aug 1, 2021 · 25f6958 · 25f6958
2 parents 4abf5fe + faa25f9
commit 25f6958
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/output/fmt.rs b/src/output/fmt.rs
@@ -65,10 +65,10 @@ impl Colorizer {
     pub(crate) fn print(&self) -> io::Result<()> {
         use termcolor::{BufferWriter, ColorSpec, WriteColor};
 
-        let color_when = if is_a_tty(self.use_stderr) {
-            self.color_when
-        } else {
-            ColorChoice::Never
+        let color_when = match self.color_when {
+            always @ ColorChoice::Always => always,
+            choice if is_a_tty(self.use_stderr) => choice,
+            _ => ColorChoice::Never,
         };
 
         let writer = if self.use_stderr {