From 6fc090fa6f98c70d95739284c5cd9d5885fa84c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Steinbrink?= <steinbrink@saltation.de>
Date: Mon, 19 Dec 2016 16:23:09 +0100
Subject: [PATCH] Only colorize missing arguments when appropriate

Instead of using Format::Error directly, we need to use a Colorizer to
make sure that the message only gets colorized when it is appropriate
to do so.

Fixes #775
---
 src/app/parser.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/parser.rs b/src/app/parser.rs
index 1e6cfd272e7..92c6ad3cd70 100644
--- a/src/app/parser.rs
+++ b/src/app/parser.rs
@@ -27,7 +27,7 @@ use args::settings::ArgSettings;
 use completions::ComplGen;
 use errors::{Error, ErrorKind};
 use errors::Result as ClapResult;
-use fmt::{Format, ColorWhen};
+use fmt::{Colorizer, ColorWhen};
 use osstringext::OsStrExt2;
 use completions::Shell;
 use suggestions;
@@ -1683,6 +1683,10 @@ impl<'a, 'b> Parser<'a, 'b>
 
     fn validate_required(&self, matcher: &ArgMatcher) -> ClapResult<()> {
         debugln!("fn=validate_required;required={:?};", self.required);
+        let c = Colorizer {
+            use_stderr: true,
+            when: self.color(),
+        };
         'outer: for name in &self.required {
             debugln!("iter;name={}", name);
             if matcher.contains(name) {
@@ -1722,7 +1726,7 @@ impl<'a, 'b> Parser<'a, 'b>
                 &*self.get_required_from(&*reqs, Some(matcher))
                       .iter()
                       .fold(String::new(),
-                          |acc, s| acc + &format!("\n    {}", Format::Error(s))[..]),
+                          |acc, s| acc + &format!("\n    {}", c.error(s))[..]),
                 &*self.create_current_usage(matcher),
                 self.color())
                 };