Auto merge of #31550 - Stebalien:fix-color, r=nrc

Fixes #31546
2016-02-12 16:42:03 +00:00 · 2016-02-12 16:42:03 +00:00 · 0c4d81f9bc
commit 0c4d81f9bc
parent c7640aa2aa 03ef55b1c8
1 changed files with 6 additions and 6 deletions
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@ -936,17 +936,17 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
            Some("human")   => ErrorOutputType::HumanReadable(color),
            Some("json") => ErrorOutputType::Json,

-            None => ErrorOutputType::default(),
+            None => ErrorOutputType::HumanReadable(color),

            Some(arg) => {
-                early_error(ErrorOutputType::default(), &format!("argument for --error-format must \
-                                                                  be human or json (instead was \
-                                                                  `{}`)",
-                                                                 arg))
+                early_error(ErrorOutputType::HumanReadable(color),
+                            &format!("argument for --error-format must be human or json (instead \
+                                      was `{}`)",
+                                     arg))
            }
        }
    } else {
-        ErrorOutputType::default()
+        ErrorOutputType::HumanReadable(color)
    };

    let unparsed_crate_types = matches.opt_strs("crate-type");