about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAaron Hill <aa1ronham@gmail.com>2020-10-19 11:49:07 -0400
committerAaron Hill <aa1ronham@gmail.com>2020-10-30 20:02:15 -0400
commit4b4f84f3274e2d5662c76f52769ac4b7e6826fcf (patch)
tree71a7a07beb79b0764d77258eddc564d04ff621bc
parent2d17597f849fce55aa730edaa8f1bf0e91d64147 (diff)
downloadrust-4b4f84f3274e2d5662c76f52769ac4b7e6826fcf.tar.gz
rust-4b4f84f3274e2d5662c76f52769ac4b7e6826fcf.zip
Only error on unfixed diagnostics
-rw-r--r--src/tools/compiletest/src/runtest.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 0f2165edacb..f36bc662ea8 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -3122,7 +3122,9 @@ impl<'test> TestCx<'test> {
                 self.fatal_proc_rec("failed to compile fixed code", &res);
             }
             if !res.stderr.is_empty() && !self.props.rustfix_only_machine_applicable {
-                self.fatal_proc_rec("fixed code is still producing diagnostics", &res);
+                if !json::rustfix_diagnostics_only(&res.stderr).is_empty() {
+                    self.fatal_proc_rec("fixed code is still producing diagnostics", &res);
+                }
             }
         }
     }