Auto merge of #646 - Mark-Simulacrum:crossbeam-utils-8, r=Mark-Simulacrum

Update crossbeam-utils to 0.8

Author: bors

Cargo.lock

@@ -17,7 +17,7 @@ base64 = "0.13.0"
 bytes = "0.4.9"
 chrono = { version = "0.4", features = ["serde"] }
 crates-index = "0.16.2"
-crossbeam-utils = "0.5"
+crossbeam-utils = "0.8"
 crossbeam-channel = "0.5"
 csv = "1.0.2"
 docsrs-metadata = { git = "https://github.com/rust-lang/docs.rs/" }

Cargo.toml

@@ -126,19 +126,21 @@ pub fn run_ex<DB: WriteResults + Sync>(
         &workers,
     );
 
-    scope(|scope| -> Fallible<()> {
+    let r = scope(|scope| -> Fallible<()> {
         let mut threads = Vec::new();
 
         for worker in &workers {
             let join =
                 scope
                     .builder()
                     .name(worker.name().into())
-                    .spawn(move || match worker.run() {
-                        Ok(()) => Ok(()),
-                        Err(r) => {
-                            log::warn!("worker {} failed: {:?}", worker.name(), r);
-                            Err(r)
+                    .spawn(move |_| -> Fallible<()> {
+                        match worker.run() {
+                            Ok(()) => Ok(()),
+                            Err(r) => {
+                                log::warn!("worker {} failed: {:?}", worker.name(), r);
+                                Err(r)
+                            }
                         }
                     })?;
             threads.push(join);
@@ -147,7 +149,7 @@ pub fn run_ex<DB: WriteResults + Sync>(
             scope
                 .builder()
                 .name("disk-space-watcher".into())
-                .spawn(|| {
+                .spawn(|_| {
                     disk_watcher.run();
                     Ok(())
                 })?;
@@ -161,9 +163,12 @@ pub fn run_ex<DB: WriteResults + Sync>(
         } else {
             bail!("some threads returned an error");
         }
-    })?;
+    });
 
-    Ok(())
+    match r {
+        Ok(r) => r,
+        Err(panic) => std::panic::resume_unwind(panic),
+    }
 }
 
 fn join_threads<'a, I>(iter: I) -> bool