itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #5790 - dwijnand:dependabot/cargo/crossbeam-0.4, r=alexcrichton

Browse Source 
Upgrade to crossbeam 0.4

Supersedes #5789
This commit is contained in:
bors 2018-07-25 23:10:21 +00:00
commit 80f69228d6
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -19,7 +19,7 @@ path = "src/cargo/lib.rs"
[dependencies] [dependencies]
atty = "0.2" atty = "0.2"
crates-io = { path = "src/crates-io", version = "0.18" } crates-io = { path = "src/crates-io", version = "0.18" }
crossbeam = "0.3" crossbeam-utils = "0.4"
crypto-hash = "0.3.1" crypto-hash = "0.3.1"
curl = "0.4.13" curl = "0.4.13"
env_logger = "0.5.4" env_logger = "0.5.4"

5
src/cargo/core/compiler/job_queue.rs
View File

@ -6,7 +6,8 @@ use std::mem;
use std::sync::mpsc::{channel, Receiver, Sender}; use std::sync::mpsc::{channel, Receiver, Sender};
use std::sync::Arc; use std::sync::Arc;
use crossbeam::{self, Scope}; use crossbeam_utils;
use crossbeam_utils::scoped::Scope;
use jobserver::{Acquired, HelperThread}; use jobserver::{Acquired, HelperThread};
use core::profiles::Profile; use core::profiles::Profile;
@ -165,7 +166,7 @@ impl<'a> JobQueue<'a> {
srv.start(move |msg| drop(tx2.send(Message::FixDiagnostic(msg)))) 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( fn drain_the_queue(

2
src/cargo/lib.rs
View File

@ -15,7 +15,7 @@ extern crate clap;
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
extern crate core_foundation; extern crate core_foundation;
extern crate crates_io as registry; extern crate crates_io as registry;
extern crate crossbeam; extern crate crossbeam_utils;
extern crate curl; extern crate curl;
#[macro_use] #[macro_use]
extern crate failure; extern crate failure;