diff options
| author | bors <bors@rust-lang.org> | 2016-02-12 16:42:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-12 16:42:03 +0000 |
| commit | 0c4d81f9bc9bb39963ded050b821347ae214d734 (patch) | |
| tree | ba5bc4c122a2ed3a418576416d761128a3430be5 | |
| parent | c7640aa2aaad857bbc9f9a1002f8e1aaf520752e (diff) | |
| parent | 03ef55b1c892837711ffb3695bc5e7386b226479 (diff) | |
| download | rust-0c4d81f9bc9bb39963ded050b821347ae214d734.tar.gz rust-0c4d81f9bc9bb39963ded050b821347ae214d734.zip | |
Auto merge of #31550 - Stebalien:fix-color, r=nrc
Fixes #31546
| -rw-r--r-- | src/librustc/session/config.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs index b02cef6c666..6e9275b553f 100644 --- 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"); |
