From 03ef55b1c892837711ffb3695bc5e7386b226479 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 10 Feb 2016 20:02:20 -0500 Subject: [PATCH] Don't assume color=always when explicitally specified Fixes #31546 --- src/librustc/session/config.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs index f6079217829..19800fbb4dc 100644 --- a/src/librustc/session/config.rs +++ b/src/librustc/session/config.rs @@ -934,17 +934,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");