Skip to content

Commit 63523e4

Browse files
Aaron1011Aaron1011
committed
Stabilize -Z emit-future-incompat as --json future-incompat 
1 parent ff23ad3 commit 63523e4

File tree

6 files changed

+19
-8
lines changed

6 files changed

+19
-8
lines changed

‎compiler/rustc_interface/src/tests.rs

-1
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,6 @@ fn test_debugging_options_tracking_hash() {
651651
untracked!(dump_mir_dir, String::from("abc"));
652652
untracked!(dump_mir_exclude_pass_number, true);
653653
untracked!(dump_mir_graphviz, true);
654-
untracked!(emit_future_incompat_report, true);
655654
untracked!(emit_stack_sizes, true);
656655
untracked!(future_incompat_test, true);
657656
untracked!(hir_stats, true);

‎compiler/rustc_session/src/config.rs

+12-2
Original file line numberDiff line numberDiff line change
@@ -746,6 +746,7 @@ impl Default for Options {
746746
edition: DEFAULT_EDITION,
747747
json_artifact_notifications: false,
748748
json_unused_externs: false,
749+
json_future_incompat: false,
749750
pretty: None,
750751
working_dir: RealFileName::LocalPath(std::env::current_dir().unwrap()),
751752
}
@@ -1257,6 +1258,7 @@ pub struct JsonConfig {
12571258
pub json_rendered: HumanReadableErrorType,
12581259
pub json_artifact_notifications: bool,
12591260
pub json_unused_externs: bool,
1261+
pub json_future_incompat: bool,
12601262
}
12611263

12621264
/// Parse the `--json` flag.
@@ -1269,6 +1271,7 @@ pub fn parse_json(matches: &getopts::Matches) -> JsonConfig {
12691271
let mut json_color = ColorConfig::Never;
12701272
let mut json_artifact_notifications = false;
12711273
let mut json_unused_externs = false;
1274+
let mut json_future_incompat = false;
12721275
for option in matches.opt_strs("json") {
12731276
// For now conservatively forbid `--color` with `--json` since `--json`
12741277
// won't actually be emitting any colors and anything colorized is
@@ -1286,6 +1289,7 @@ pub fn parse_json(matches: &getopts::Matches) -> JsonConfig {
12861289
"diagnostic-rendered-ansi" => json_color = ColorConfig::Always,
12871290
"artifacts" => json_artifact_notifications = true,
12881291
"unused-externs" => json_unused_externs = true,
1292+
"future-incompat" => json_future_incompat = true,
12891293
s => early_error(
12901294
ErrorOutputType::default(),
12911295
&format!("unknown `--json` option `{}`", s),
@@ -1298,6 +1302,7 @@ pub fn parse_json(matches: &getopts::Matches) -> JsonConfig {
12981302
json_rendered: json_rendered(json_color),
12991303
json_artifact_notifications,
13001304
json_unused_externs,
1305+
json_future_incompat,
13011306
}
13021307
}
13031308

@@ -2011,8 +2016,12 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
20112016

20122017
let edition = parse_crate_edition(matches);
20132018

2014-
let JsonConfig { json_rendered, json_artifact_notifications, json_unused_externs } =
2015-
parse_json(matches);
2019+
let JsonConfig {
2020+
json_rendered,
2021+
json_artifact_notifications,
2022+
json_unused_externs,
2023+
json_future_incompat,
2024+
} = parse_json(matches);
20162025

20172026
let error_format = parse_error_format(matches, color, json_rendered);
20182027

@@ -2248,6 +2257,7 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
22482257
edition,
22492258
json_artifact_notifications,
22502259
json_unused_externs,
2260+
json_future_incompat,
22512261
pretty,
22522262
working_dir,
22532263
}

‎compiler/rustc_session/src/options.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,9 @@ top_level_options!(
205205
/// `true` if we're emitting a JSON blob containing the unused externs
206206
json_unused_externs: bool [UNTRACKED],
207207

208+
/// `true` if we're emitting a JSON job containg a future-incompat report for lints
209+
json_future_incompat: bool [TRACKED],
210+
208211
pretty: Option<PpMode> [UNTRACKED],
209212

210213
/// The (potentially remapped) working directory
@@ -1124,8 +1127,6 @@ options! {
11241127
computed `block` spans (one span encompassing a block's terminator and \
11251128
all statements). If `-Z instrument-coverage` is also enabled, create \
11261129
an additional `.html` file showing the computed coverage spans."),
1127-
emit_future_incompat_report: bool = (false, parse_bool, [UNTRACKED],
1128-
"emits a future-incompatibility report for lints (RFC 2834)"),
11291130
emit_stack_sizes: bool = (false, parse_bool, [UNTRACKED],
11301131
"emit a section containing stack size metadata (default: no)"),
11311132
fewer_names: Option<bool> = (None, parse_opt_bool, [TRACKED],

‎compiler/rustc_session/src/session.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ impl Session {
280280
}
281281

282282
fn emit_future_breakage(&self) {
283-
if !self.opts.debugging_opts.emit_future_incompat_report {
283+
if !self.opts.json_future_incompat {
284284
return;
285285
}
286286

‎src/test/ui/lint/future-incompat-test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// compile-flags: -Zfuture-incompat-test -Zemit-future-incompat-report
1+
// compile-flags: -Zfuture-incompat-test
22
// check-pass
33

44
// The `-Zfuture-incompat-test flag causes any normal warning to be included

‎src/tools/compiletest/src/runtest.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1802,18 +1802,19 @@ impl<'test> TestCx<'test> {
18021802
// patterns still match the raw compiler output.
18031803
if self.props.error_patterns.is_empty() {
18041804
rustc.args(&["--error-format", "json"]);
1805+
rustc.args(&["--json", "future-incompat"]);
18051806
}
18061807
rustc.arg("-Zui-testing");
18071808
rustc.arg("-Zdeduplicate-diagnostics=no");
18081809
}
18091810
Ui => {
18101811
if !self.props.compile_flags.iter().any(|s| s.starts_with("--error-format")) {
18111812
rustc.args(&["--error-format", "json"]);
1813+
rustc.args(&["--json", "future-incompat"]);
18121814
}
18131815
rustc.arg("-Ccodegen-units=1");
18141816
rustc.arg("-Zui-testing");
18151817
rustc.arg("-Zdeduplicate-diagnostics=no");
1816-
rustc.arg("-Zemit-future-incompat-report");
18171818
}
18181819
MirOpt => {
18191820
rustc.args(&[

0 commit comments

Comments
 (0)