From 90a71870c1c10334e913cd65e64721e416477ca6 Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Mon, 13 Aug 2018 17:55:21 +1200 Subject: [PATCH 1/2] Update crossbeam to 0.4 --- Cargo.toml | 2 +- src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0b50182..3bb088f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT" [dependencies] variance = "0.1" -crossbeam = "0.2" +crossbeam = "0.4" scopeguard = "0.1" [dev-dependencies] diff --git a/src/lib.rs b/src/lib.rs index 778c96b..c4aa775 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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}; From c5a100ee6c0bea553d915a07ad4e33b86c4689da Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Mon, 13 Aug 2018 17:55:45 +1200 Subject: [PATCH 2/2] Fix compile error with rustc 1.27.1 --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index c4aa775..a0fdfff 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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());