diff --git a/Cargo.toml b/Cargo.toml index ccc4f2f4141..8069fcf6e4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ path = "src/cargo/lib.rs" [dependencies] atty = "0.2" crates-io = { path = "src/crates-io", version = "0.18" } -crossbeam = "0.3" +crossbeam-utils = "0.4" crypto-hash = "0.3.1" curl = "0.4.13" env_logger = "0.5.4" diff --git a/src/cargo/core/compiler/job_queue.rs b/src/cargo/core/compiler/job_queue.rs index e80d5c0356e..47068295255 100644 --- a/src/cargo/core/compiler/job_queue.rs +++ b/src/cargo/core/compiler/job_queue.rs @@ -6,7 +6,8 @@ use std::mem; use std::sync::mpsc::{channel, Receiver, Sender}; use std::sync::Arc; -use crossbeam::{self, Scope}; +use crossbeam_utils; +use crossbeam_utils::scoped::Scope; use jobserver::{Acquired, HelperThread}; use core::profiles::Profile; @@ -165,7 +166,7 @@ impl<'a> JobQueue<'a> { srv.start(move |msg| drop(tx2.send(Message::FixDiagnostic(msg)))) }); - crossbeam::scope(|scope| self.drain_the_queue(cx, plan, scope, &helper)) + crossbeam_utils::scoped::scope(|scope| self.drain_the_queue(cx, plan, scope, &helper)) } fn drain_the_queue( diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs index 987a130905f..6b3fa6049e9 100644 --- a/src/cargo/lib.rs +++ b/src/cargo/lib.rs @@ -15,7 +15,7 @@ extern crate clap; #[cfg(target_os = "macos")] extern crate core_foundation; extern crate crates_io as registry; -extern crate crossbeam; +extern crate crossbeam_utils; extern crate curl; #[macro_use] extern crate failure;