Skip to content

Commit 177337d

Browse files
Stabilize short error format
1 parent 6de4ec6 commit 177337d

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

src/librustc/session/config.rs

+1-13
Original file line numberDiff line numberDiff line change
@@ -1799,19 +1799,7 @@ pub fn build_session_options_and_crate_config(
17991799
Some("human") => ErrorOutputType::HumanReadable(color),
18001800
Some("json") => ErrorOutputType::Json(false),
18011801
Some("pretty-json") => ErrorOutputType::Json(true),
1802-
Some("short") => {
1803-
if nightly_options::is_unstable_enabled(matches) {
1804-
ErrorOutputType::Short(color)
1805-
} else {
1806-
early_error(
1807-
ErrorOutputType::default(),
1808-
&format!(
1809-
"the `-Z unstable-options` flag must also be passed to \
1810-
enable the short error message option"
1811-
),
1812-
);
1813-
}
1814-
}
1802+
Some("short") => ErrorOutputType::Short(color),
18151803
None => ErrorOutputType::HumanReadable(color),
18161804

18171805
Some(arg) => early_error(

src/test/ui/short-error-format.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// compile-flags: --error-format=short -Zunstable-options
11+
// compile-flags: --error-format=short
1212

1313
fn foo(_: u32) {}
1414

0 commit comments

Comments
 (0)