From 5e71ad6c5b4b4f9d63400464d331c6d210ac8e70 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 12 Nov 2018 08:04:28 -0800
Subject: [PATCH] Upgrade crossbeam-utils to 0.6.0

---
 src/cargo/core/compiler/job_queue.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/cargo/core/compiler/job_queue.rs b/src/cargo/core/compiler/job_queue.rs
index f97c7421..806412bc 100644
--- a/src/cargo/core/compiler/job_queue.rs
+++ b/src/cargo/core/compiler/job_queue.rs
@@ -201,7 +201,9 @@ impl<'a> JobQueue<'a> {
                 srv.start(move |msg| drop(tx2.send(Message::FixDiagnostic(msg))))
             });
 
-        crossbeam_utils::thread::scope(|scope| self.drain_the_queue(cx, plan, scope, &helper))
+        crossbeam_utils::thread::scope(|scope| {
+            self.drain_the_queue(cx, plan, scope, &helper)
+        }).expect("child threads should't panic")
     }
 
     fn drain_the_queue(
@@ -409,7 +411,7 @@ impl<'a> JobQueue<'a> {
         match fresh {
             Freshness::Fresh => doit(),
             Freshness::Dirty => {
-                scope.spawn(doit);
+                scope.spawn(move |_| doit());
             }
         }
 
-- 
2.20.0