Merge pull request #748 from Mark-Simulacrum/debug-crater

Debug crater

src/report/mod.rs

@@ -228,21 +228,18 @@ pub fn generate_report<DB: ReadResults>(
         .iter()
         .map(|krate| {
             // Any errors here will turn into unknown results
-            let crate_results = ex.toolchains.iter().map(|tc| -> Fallible<BuildTestResult> {
-                let res = db
-                    .load_test_result(ex, tc, krate)?
-                    .ok_or_else(|| err_msg("no result"))?;
+            let mut crate_results = ex.toolchains.iter().map(|tc| -> Option<BuildTestResult> {
+                // Convert errors to None with ok()
+                let res = db.load_test_result(ex, tc, krate).ok()??;
 
-                Ok(BuildTestResult {
+                Some(BuildTestResult {
                     res,
                     log: crate_to_path_fragment(tc, krate, SanitizationContext::Url)
                         .to_str()
                         .unwrap()
                         .replace('\'', "/"), // Normalize paths in reports generated on Windows
                 })
             });
-            // Convert errors to Nones
-            let mut crate_results = crate_results.map(|r| r.ok());
             let crate1 = crate_results.next().unwrap();
             let crate2 = crate_results.next().unwrap();
             let comp = compare(

src/results/db.rs

@@ -133,6 +133,10 @@ impl<'a> DatabaseDB<'a> {
         res: &TestResult,
         log: EncodedLog,
     ) -> Fallible<usize> {
+        log::info!(
+            "insert {krate:?} for ex={ex:?} with tc={toolchain:?}; result={res:?}",
+            ex = &ex.name
+        );
         self.db.execute(
             "INSERT INTO results (experiment, crate, toolchain, result, log, encoding) \
              VALUES (?1, ?2, ?3, ?4, ?5, ?6);",

src/utils/mod.rs

@@ -95,5 +95,5 @@ fn is_backtrace_runtime_enabled() -> bool {
     std::env::var("RUST_BACKTRACE")
         .ok()
         .and_then(|s| i32::from_str(&s).ok())
-        .map_or(false, |val| val != 0)
+        .is_some_and(|val| val != 0)
 }