diff options
| -rw-r--r-- | src/librustc/session/config.rs | 14 | ||||
| -rw-r--r-- | src/test/ui/short-error-format.rs | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs index 35538e5d02a..cc8e8c7c31c 100644 --- a/src/librustc/session/config.rs +++ b/src/librustc/session/config.rs @@ -1799,19 +1799,7 @@ pub fn build_session_options_and_crate_config( Some("human") => ErrorOutputType::HumanReadable(color), Some("json") => ErrorOutputType::Json(false), Some("pretty-json") => ErrorOutputType::Json(true), - Some("short") => { - if nightly_options::is_unstable_enabled(matches) { - ErrorOutputType::Short(color) - } else { - early_error( - ErrorOutputType::default(), - &format!( - "the `-Z unstable-options` flag must also be passed to \ - enable the short error message option" - ), - ); - } - } + Some("short") => ErrorOutputType::Short(color), None => ErrorOutputType::HumanReadable(color), Some(arg) => early_error( diff --git a/src/test/ui/short-error-format.rs b/src/test/ui/short-error-format.rs index ecce824ca17..3e6802c51c3 100644 --- a/src/test/ui/short-error-format.rs +++ b/src/test/ui/short-error-format.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// compile-flags: --error-format=short -Zunstable-options +// compile-flags: --error-format=short fn foo(_: u32) {} |