diff options
| author | Aaron Hill <aa1ronham@gmail.com> | 2021-12-04 14:34:20 -0500 |
|---|---|---|
| committer | Aaron Hill <aa1ronham@gmail.com> | 2021-12-04 14:34:20 -0500 |
| commit | 63523e4d1c2fe6683b035c6818cafa9f77614711 (patch) | |
| tree | 978ae7e0261b3490e7f59813d34c6d0efe3e6a4c /src | |
| parent | ff23ad3179014ba258f2b540fb39dd0f26852b7a (diff) | |
| download | rust-63523e4d1c2fe6683b035c6818cafa9f77614711.tar.gz rust-63523e4d1c2fe6683b035c6818cafa9f77614711.zip | |
Stabilize `-Z emit-future-incompat` as `--json future-incompat`
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/ui/lint/future-incompat-test.rs | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/test/ui/lint/future-incompat-test.rs b/src/test/ui/lint/future-incompat-test.rs index ce8c118dab2..c5f477cc450 100644 --- a/src/test/ui/lint/future-incompat-test.rs +++ b/src/test/ui/lint/future-incompat-test.rs @@ -1,4 +1,4 @@ -// compile-flags: -Zfuture-incompat-test -Zemit-future-incompat-report +// compile-flags: -Zfuture-incompat-test // check-pass // The `-Zfuture-incompat-test flag causes any normal warning to be included diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 727eecbb732..f1f285ace17 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(&[ |