From 4b73ed06cb62f4c5c105bb63369c1c011fa7150a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Wed, 25 Jul 2018 05:31:03 +0000
Subject: [PATCH 1/4] Update crossbeam requirement to 0.4

Updates the requirements on [crossbeam](https://github.com/crossbeam-rs/crossbeam) to permit the latest version.
- [Release notes](https://github.com/crossbeam-rs/crossbeam/releases)
- [Changelog](https://github.com/crossbeam-rs/crossbeam/blob/master/CHANGELOG.md)
- [Commits](https://github.com/crossbeam-rs/crossbeam/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index ccc4f2f4141..1e3f4292898 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 = "0.4"
 crypto-hash = "0.3.1"
 curl = "0.4.13"
 env_logger = "0.5.4"

From 16681b3dfdd26ecea1693a1bb222160bfc59f8f5 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Wed, 25 Jul 2018 06:50:07 +0100
Subject: [PATCH 2/4] Migrate to crossbeam's new 0.4 API

---
 src/cargo/core/compiler/job_queue.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cargo/core/compiler/job_queue.rs b/src/cargo/core/compiler/job_queue.rs
index e80d5c0356e..fcd9e36422c 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;
+use crossbeam::thread::Scope;
 use jobserver::{Acquired, HelperThread};
 
 use core::profiles::Profile;

From ac2d5d0917f6824c515688a8c1fd3b76a97af9af Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Wed, 25 Jul 2018 17:11:21 +0100
Subject: [PATCH 3/4] Update the minimal parking_lot_core version

---
 Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Cargo.toml b/Cargo.toml
index 1e3f4292898..1f83bb53f07 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,6 +40,7 @@ libc = "0.2"
 log = "0.4"
 libgit2-sys = "0.7.5"
 num_cpus = "1.0"
+parking_lot_core = "0.2.11" # required only for minimal-versions. brought in by crossbeam.
 rustfix = "0.4"
 same-file = "1"
 semver = { version = "0.9.0", features = ["serde"] }

From 8ea90e96cf4df015722b8823b9cbfffc70ec698e Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Wed, 25 Jul 2018 23:32:25 +0100
Subject: [PATCH 4/4] Switch to crossbeam_utils crate, sidesteppin

---
 Cargo.toml                           | 3 +--
 src/cargo/core/compiler/job_queue.rs | 6 +++---
 src/cargo/lib.rs                     | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1f83bb53f07..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.4"
+crossbeam-utils = "0.4"
 crypto-hash = "0.3.1"
 curl = "0.4.13"
 env_logger = "0.5.4"
@@ -40,7 +40,6 @@ libc = "0.2"
 log = "0.4"
 libgit2-sys = "0.7.5"
 num_cpus = "1.0"
-parking_lot_core = "0.2.11" # required only for minimal-versions. brought in by crossbeam.
 rustfix = "0.4"
 same-file = "1"
 semver = { version = "0.9.0", features = ["serde"] }
diff --git a/src/cargo/core/compiler/job_queue.rs b/src/cargo/core/compiler/job_queue.rs
index fcd9e36422c..47068295255 100644
--- a/src/cargo/core/compiler/job_queue.rs
+++ b/src/cargo/core/compiler/job_queue.rs
@@ -6,8 +6,8 @@ use std::mem;
 use std::sync::mpsc::{channel, Receiver, Sender};
 use std::sync::Arc;
 
-use crossbeam;
-use crossbeam::thread::Scope;
+use crossbeam_utils;
+use crossbeam_utils::scoped::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::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;