Skip to content

Commit 438c55d

Browse files
committed
Auto merge of #6307 - alexcrichton:upgrade-crossbeam-utils, r=alexcrichton
Upgrade crossbeam-utils to 0.6.0
2 parents e48153e + 5e71ad6 commit 438c55d

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ path = "src/cargo/lib.rs"
2020
atty = "0.2"
2121
bytesize = "1.0"
2222
crates-io = { path = "src/crates-io", version = "0.21" }
23-
crossbeam-utils = "0.5"
23+
crossbeam-utils = "0.6"
2424
crypto-hash = "0.3.1"
2525
curl = { version = "0.4.19", features = ['http2'] }
2626
curl-sys = "0.4.15"

src/cargo/core/compiler/job_queue.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,9 @@ impl<'a> JobQueue<'a> {
201201
srv.start(move |msg| drop(tx2.send(Message::FixDiagnostic(msg))))
202202
});
203203

204-
crossbeam_utils::thread::scope(|scope| self.drain_the_queue(cx, plan, scope, &helper))
204+
crossbeam_utils::thread::scope(|scope| {
205+
self.drain_the_queue(cx, plan, scope, &helper)
206+
}).expect("child threads should't panic")
205207
}
206208

207209
fn drain_the_queue(
@@ -409,7 +411,7 @@ impl<'a> JobQueue<'a> {
409411
match fresh {
410412
Freshness::Fresh => doit(),
411413
Freshness::Dirty => {
412-
scope.spawn(doit);
414+
scope.spawn(move |_| doit());
413415
}
414416
}
415417

0 commit comments

Comments
 (0)