diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-12-05 15:04:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-05 15:04:22 +0100 |
| commit | 068b30420aea9ab762d3159cc084fb6c3cc688fd (patch) | |
| tree | d8d03f9259e1c2c4a929cc73d5938bef261cbdb3 /src/tools/compiletest | |
| parent | 609d9a0108d4e6d79279fc6c5901eb5041c7aac7 (diff) | |
| parent | 63523e4d1c2fe6683b035c6818cafa9f77614711 (diff) | |
| download | rust-068b30420aea9ab762d3159cc084fb6c3cc688fd.tar.gz rust-068b30420aea9ab762d3159cc084fb6c3cc688fd.zip | |
Rollup merge of #91535 - Aaron1011:stabilize-future-incompat, r=nagisa
Stabilize `-Z emit-future-incompat` as `--json future-incompat` The FCP was completed in https://github.com/rust-lang/rust/issues/71249
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 4bf74c1508b..3ccd4a1cc59 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -1802,6 +1802,7 @@ impl<'test> TestCx<'test> { // patterns still match the raw compiler output. if self.props.error_patterns.is_empty() { rustc.args(&["--error-format", "json"]); + rustc.args(&["--json", "future-incompat"]); } rustc.arg("-Zui-testing"); rustc.arg("-Zdeduplicate-diagnostics=no"); @@ -1809,11 +1810,11 @@ impl<'test> TestCx<'test> { Ui => { if !self.props.compile_flags.iter().any(|s| s.starts_with("--error-format")) { rustc.args(&["--error-format", "json"]); + rustc.args(&["--json", "future-incompat"]); } rustc.arg("-Ccodegen-units=1"); rustc.arg("-Zui-testing"); rustc.arg("-Zdeduplicate-diagnostics=no"); - rustc.arg("-Zemit-future-incompat-report"); } MirOpt => { rustc.args(&[ |