Skip to content

Commit cef7c56

Browse files
committed
Auto merge of #5803 - dwijnand:dependabot/cargo/crossbeam-utils-0.5, r=matklad
Upgrade to crossbeam-utils's -new 0.5 API Supersedes #5800
2 parents 191bfbf + 810a0a1 commit cef7c56

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ path = "src/cargo/lib.rs"
1919
[dependencies]
2020
atty = "0.2"
2121
crates-io = { path = "src/crates-io", version = "0.18" }
22-
crossbeam-utils = "0.4"
22+
crossbeam-utils = "0.5"
2323
crypto-hash = "0.3.1"
2424
curl = "0.4.13"
2525
env_logger = "0.5.4"

src/cargo/core/compiler/job_queue.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::sync::mpsc::{channel, Receiver, Sender};
77
use std::sync::Arc;
88

99
use crossbeam_utils;
10-
use crossbeam_utils::scoped::Scope;
10+
use crossbeam_utils::thread::Scope;
1111
use jobserver::{Acquired, HelperThread};
1212

1313
use core::profiles::Profile;
@@ -166,7 +166,7 @@ impl<'a> JobQueue<'a> {
166166
srv.start(move |msg| drop(tx2.send(Message::FixDiagnostic(msg))))
167167
});
168168

169-
crossbeam_utils::scoped::scope(|scope| self.drain_the_queue(cx, plan, scope, &helper))
169+
crossbeam_utils::thread::scope(|scope| self.drain_the_queue(cx, plan, scope, &helper))
170170
}
171171

172172
fn drain_the_queue(

0 commit comments

Comments
 (0)