Skip to content

Upgrade to crossbeam 0.4 #5790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 26, 2018
Merged

Upgrade to crossbeam 0.4 #5790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b73ed0
Update crossbeam requirement to 0.4
dependabot-support Jul 25, 2018
16681b3
Migrate to crossbeam's new 0.4 API
dwijnand Jul 25, 2018
ac2d5d0
Update the minimal parking_lot_core version
dwijnand Jul 25, 2018
8ea90e9
Switch to crossbeam_utils crate, sidesteppin
dwijnand Jul 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions src/cargo/core/compiler/job_queue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down