Skip to content

Update crossbeam to 0.4 #9

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

Open
rocallahan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update crossbeam to 0.4 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90a7187
Update crossbeam to 0.4
rocallahan Aug 13, 2018
c5a100e
Fix compile error with rustc 1.27.1
rocallahan Aug 13, 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 @@ -10,7 +10,7 @@ license = "MIT"

[dependencies]
variance = "0.1"
crossbeam = "0.2"
crossbeam = "0.4"
scopeguard = "0.1"

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern crate crossbeam;
extern crate scopeguard;

use variance::InvariantLifetime as Id;
use crossbeam::sync::MsQueue;
use crossbeam::queue::MsQueue;

use std::{thread, mem};
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
Expand Down Expand Up @@ -322,7 +322,7 @@ impl<'scope> Scope<'scope> {
pub fn zoom<'smaller, F, R>(&self, scheduler: F) -> R
where F: FnOnce(&Scope<'smaller>) -> R,
'scope: 'smaller {
let scope = unsafe { self.refine::<'smaller>() };
let scope = unsafe { self.refine() };

// Join the scope either on completion of the scheduler or panic.
defer!(scope.join());
Expand Down