Merge pull request #1557 from Mark-Simulacrum/revert-panic

Revert "Report errors during crate preparation in collector"

Author: Mark-Simulacrum

collector/src/benchmark/mod.rs

@@ -253,18 +253,15 @@ impl Benchmark {
             for (profile, prep_dir) in &profile_dirs {
                 let server = server.clone();
                 s.spawn::<_, anyhow::Result<()>>(move |_| {
-                    // Panic the thread if an error occurs to make sure that the whole scope will
-                    // also panic if there was some error.
                     self.mk_cargo_process(compiler, prep_dir.path(), *profile)
                         .jobserver(server)
-                        .run_rustc(false)
-                        .unwrap();
+                        .run_rustc(false)?;
                     Ok(())
                 });
             }
             Ok(())
         })
-        .expect("Preparation has failed")?;
+        .unwrap()?;
 
         for (profile, prep_dir) in profile_dirs {
             eprintln!("Running {}: {:?} + {:?}", self.name, profile, scenarios);