Auto merge of #689 - Mark-Simulacrum:retry-regressions, r=Mark-Simulacrum

Automatically ignore trybuild compiler diagnostic changes

Author: bors

src/report/display.rs

@@ -17,6 +17,7 @@ impl ResultName for FailureReason {
             FailureReason::ICE => "ICE".into(),
             FailureReason::CompilerError(_) => "compiler error".into(),
             FailureReason::DependsOn(_) => "faulty deps".into(),
+            FailureReason::CompilerDiagnosticChange => "compiler diagnostic changed".into(),
         }
     }
 
@@ -27,6 +28,7 @@ impl ResultName for FailureReason {
             | FailureReason::NetworkAccess
             | FailureReason::Timeout
             | FailureReason::OOM
+            | FailureReason::CompilerDiagnosticChange
             | FailureReason::ICE => self.short_name(),
         }
     }

src/results/mod.rs

@@ -199,6 +199,7 @@ pub enum FailureReason {
     Timeout,
     ICE,
     NetworkAccess,
+    CompilerDiagnosticChange,
     CompilerError(BTreeSet<DiagnosticCode>),
     DependsOn(BTreeSet<Crate>),
 }
@@ -230,6 +231,7 @@ impl ::std::fmt::Display for FailureReason {
                     .collect::<Vec<String>>()
                     .join(", "),
             ),
+            FailureReason::CompilerDiagnosticChange => write!(f, "compiler-diagnostic-change"),
         }
     }
 }
@@ -274,7 +276,10 @@ impl ::std::str::FromStr for FailureReason {
 impl FailureReason {
     pub(crate) fn is_spurious(&self) -> bool {
         match *self {
-            FailureReason::OOM | FailureReason::Timeout | FailureReason::NetworkAccess => true,
+            FailureReason::OOM
+            | FailureReason::Timeout
+            | FailureReason::NetworkAccess
+            | FailureReason::CompilerDiagnosticChange => true,
             FailureReason::CompilerError(_)
             | FailureReason::DependsOn(_)
             | FailureReason::Unknown

src/runner/test.rs

@@ -110,6 +110,7 @@ fn run_cargo<DB: WriteResults>(
 
     let mut did_ice = false;
     let mut did_network = false;
+    let mut did_trybuild = false;
     let mut error_codes = BTreeSet::new();
     let mut deps = BTreeSet::new();
 
@@ -123,6 +124,9 @@ fn run_cargo<DB: WriteResults>(
         if line.contains("code: 111") && line.contains("Connection refused") {
             did_network = true;
         }
+        if line.contains("the environment variable TRYBUILD=overwrite") {
+            did_trybuild = true;
+        }
 
         // Avoid trying to deserialize non JSON output
         if !line.starts_with('{') {
@@ -198,6 +202,8 @@ fn run_cargo<DB: WriteResults>(
                 Err(e.context(FailureReason::CompilerError(error_codes)).into())
             } else if did_network {
                 Err(e.context(FailureReason::NetworkAccess).into())
+            } else if did_trybuild {
+                Err(e.context(FailureReason::CompilerDiagnosticChange).into())
             } else {
                 Err(e.into())
             }