Port to crossbeam-queue 0.1

Author: cuviper

rayon-core/Cargo.toml

@@ -18,10 +18,7 @@ num_cpus = "1.2"
 libc = "0.2.16"
 lazy_static = "1"
 crossbeam-deque = "0.6.3"
-
-# Also held back for rustc compatibility
-[dependencies.crossbeam]
-version = "0.3.0"
+crossbeam-queue = "0.1.2"
 
 [dev-dependencies]
 rand = "0.6"

rayon-core/src/job.rs

@@ -1,4 +1,4 @@
-use crossbeam::sync::SegQueue;
+use crossbeam_queue::SegQueue;
 use latch::Latch;
 use std::any::Any;
 use std::cell::UnsafeCell;
@@ -205,10 +205,6 @@ impl JobFifo {
 impl Job for JobFifo {
     unsafe fn execute(this: *const Self) {
         // We "execute" a queue by executing its first job, FIFO.
-        (*this)
-            .inner
-            .try_pop()
-            .expect("job in fifo queue")
-            .execute()
+        (*this).inner.pop().expect("job in fifo queue").execute()
     }
 }

rayon-core/src/lib.rs

@@ -31,8 +31,8 @@ use std::io;
 use std::marker::PhantomData;
 use std::str::FromStr;
 
-extern crate crossbeam;
 extern crate crossbeam_deque;
+extern crate crossbeam_queue;
 #[macro_use]
 extern crate lazy_static;
 extern crate libc;

rayon-core/src/registry.rs

@@ -1,5 +1,5 @@
-use crossbeam::sync::SegQueue;
 use crossbeam_deque::{self as deque, Pop, Steal, Stealer, Worker};
+use crossbeam_queue::SegQueue;
 #[cfg(rayon_unstable)]
 use internal::task::Task;
 #[cfg(rayon_unstable)]
@@ -327,7 +327,7 @@ impl Registry {
     }
 
     fn pop_injected_job(&self, worker_index: usize) -> Option<JobRef> {
-        let job = self.injected_jobs.try_pop();
+        let job = self.injected_jobs.pop().ok();
         if job.is_some() {
             log!(UninjectedWork {
                 worker: worker_index