From 6f11cd9e14cc06643bda060b20160e3962a76595 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 26 Jul 2018 05:30:17 +0000 Subject: [PATCH 1/2] Update crossbeam-utils requirement to 0.5 Updates the requirements on [crossbeam-utils](https://github.com/crossbeam-rs/crossbeam-utils) to permit the latest version. - [Release notes](https://github.com/crossbeam-rs/crossbeam-utils/releases) - [Changelog](https://github.com/crossbeam-rs/crossbeam-utils/blob/master/CHANGELOG.md) - [Commits](https://github.com/crossbeam-rs/crossbeam-utils/commits/v0.5.0) Signed-off-by: dependabot[bot] --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 8069fcf6e4d..8f6bc43b401 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-utils = "0.4" +crossbeam-utils = "0.5" crypto-hash = "0.3.1" curl = "0.4.13" env_logger = "0.5.4" From 810a0a1eca24f864839b471e1ef3d3e6f9beba87 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Thu, 26 Jul 2018 06:47:19 +0100 Subject: [PATCH 2/2] Upgrade to crossbeam-utils's -new 0.5 API --- src/cargo/core/compiler/job_queue.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cargo/core/compiler/job_queue.rs b/src/cargo/core/compiler/job_queue.rs index 47068295255..1523ccdfa5c 100644 --- a/src/cargo/core/compiler/job_queue.rs +++ b/src/cargo/core/compiler/job_queue.rs @@ -7,7 +7,7 @@ use std::sync::mpsc::{channel, Receiver, Sender}; use std::sync::Arc; use crossbeam_utils; -use crossbeam_utils::scoped::Scope; +use crossbeam_utils::thread::Scope; use jobserver::{Acquired, HelperThread}; use core::profiles::Profile; @@ -166,7 +166,7 @@ impl<'a> JobQueue<'a> { srv.start(move |msg| drop(tx2.send(Message::FixDiagnostic(msg)))) }); - crossbeam_utils::scoped::scope(|scope| self.drain_the_queue(cx, plan, scope, &helper)) + crossbeam_utils::thread::scope(|scope| self.drain_the_queue(cx, plan, scope, &helper)) } fn drain_the_queue(