handle other PrepareErrors

blocked on rust-lang/rustwide#103

Author: Skgland

Cargo.lock

@@ -77,3 +77,6 @@ zstd = "0.13.0"
 assert_cmd = "2.0.4"
 difference = "2.0.0"
 predicates = "3.0.4"
+
+[patch.crates-io]
+rustwide = { git = "https://github.com/rust-lang/rustwide.git", rev = "refs/pull/103/head" }

Cargo.toml

@@ -7,7 +7,7 @@ use crate::runner::tasks::TaskCtx;
 use crate::runner::OverrideResult;
 use anyhow::Error;
 use cargo_metadata::diagnostic::DiagnosticLevel;
-use cargo_metadata::{Message, Metadata, Package, Target};
+use cargo_metadata::{Message, Metadata, Package, Resolve, Target};
 use docsrs_metadata::Metadata as DocsrsMetadata;
 use remove_dir_all::remove_dir_all;
 use rustwide::cmd::{CommandError, MountKind, ProcessLinesActions, SandboxBuilder};
@@ -48,24 +48,37 @@ pub(super) fn detect_broken<T>(res: Result<T, Error>) -> Result<T, Error> {
     match res {
         Ok(ok) => Ok(ok),
         Err(err) => {
-            let mut reason = None;
-
             if let Some(error) = err.downcast_ref() {
-                reason = match *error {
-                    PrepareError::MissingCargoToml => Some(BrokenReason::CargoToml),
-                    PrepareError::InvalidCargoTomlSyntax => Some(BrokenReason::CargoToml),
-                    PrepareError::YankedDependencies(_) => Some(BrokenReason::Yanked),
-                    PrepareError::MissingDependencies(_) => Some(BrokenReason::MissingDependencies),
-                    PrepareError::PrivateGitRepository => Some(BrokenReason::MissingGitRepository),
-                    _ => None,
-                }
-            }
+                let reason = match *error {
+                    PrepareError::MissingCargoToml => {
+                        TestResult::BrokenCrate(BrokenReason::CargoToml)
+                    }
+                    PrepareError::InvalidCargoTomlSyntax => {
+                        TestResult::BrokenCrate(BrokenReason::CargoToml)
+                    }
+                    PrepareError::YankedDependencies(_) => {
+                        TestResult::BrokenCrate(BrokenReason::Yanked)
+                    }
+                    PrepareError::MissingDependencies(_) => {
+                        TestResult::BrokenCrate(BrokenReason::MissingDependencies)
+                    }
+                    PrepareError::PrivateGitRepository => {
+                        TestResult::BrokenCrate(BrokenReason::MissingGitRepository)
+                    }
+                    _ => {
+                        let reason = failure_reason(&err);
+                        if reason.is_spurious() || matches!(reason, FailureReason::Unknown) {
+                            TestResult::PrepareFail(reason)
+                        } else {
+                            TestResult::BrokenCrate(BrokenReason::Unknown)
+                        }
+                    }
+                };
 
-            if let Some(reason) = reason {
-                Err(err.context(OverrideResult(TestResult::BrokenCrate(reason))))
-            } else {
-                Err(err)
+                return Err(err.context(OverrideResult(reason)));
             }
+
+            Err(err)
         }
     }
 }