Use subcrates

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "crossbeam"
-version = "0.3.2"
-authors = ["Aaron Turon <[email protected]>"]
+version = "0.4.0"
+authors = ["The Crossbeam Project Developers"]
 description = "Support for lock-free data structures, synchronizers, and parallel programming"
 repository = "https://github.com/crossbeam-rs/crossbeam"
 documentation = "https://docs.rs/crossbeam"
@@ -10,7 +10,14 @@ license = "Apache-2.0/MIT"
 categories = ["concurrency", "data-structures"]
 
 [features]
-nightly = []
+default = ["use_std"]
+nightly = ["crossbeam-epoch/nightly"]
+use_std = ["crossbeam-epoch/use_std"]
+
+[dependencies]
+crossbeam-epoch = "0.2"
+crossbeam-utils = "0.2"
+crossbeam-deque = "0.1"
 
 [dev-dependencies]
 rand = "0.4"

src/bin/bench.rs

@@ -32,17 +32,27 @@ trait Queue<T> {
 }
 
 impl<T> Queue<T> for MsQueue<T> {
-    fn push(&self, t: T) { self.push(t) }
-    fn try_pop(&self) -> Option<T> { self.try_pop() }
+    fn push(&self, t: T) {
+        self.push(t)
+    }
+    fn try_pop(&self) -> Option<T> {
+        self.try_pop()
+    }
 }
 
 impl<T> Queue<T> for SegQueue<T> {
-    fn push(&self, t: T) { self.push(t) }
-    fn try_pop(&self) -> Option<T> { self.try_pop() }
+    fn push(&self, t: T) {
+        self.push(t)
+    }
+    fn try_pop(&self) -> Option<T> {
+        self.try_pop()
+    }
 }
 
 impl<T> Queue<T> for MpscQueue<T> {
-    fn push(&self, t: T) { self.push(t) }
+    fn push(&self, t: T) {
+        self.push(t)
+    }
     fn try_pop(&self) -> Option<T> {
         use extra_impls::mpsc_queue::*;
 
@@ -57,8 +67,12 @@ impl<T> Queue<T> for MpscQueue<T> {
 }
 
 impl<T> Queue<T> for Mutex<VecDeque<T>> {
-    fn push(&self, t: T) { self.lock().unwrap().push_back(t) }
-    fn try_pop(&self) -> Option<T> { self.lock().unwrap().pop_front() }
+    fn push(&self, t: T) {
+        self.lock().unwrap().push_back(t)
+    }
+    fn try_pop(&self) -> Option<T> {
+        self.lock().unwrap().pop_front()
+    }
 }
 
 fn bench_queue_mpsc<Q: Queue<u64> + Sync>(q: Q) -> f64 {
@@ -74,7 +88,7 @@ fn bench_queue_mpsc<Q: Queue<u64> + Sync>(q: Q) -> f64 {
             }
 
             let mut count = 0;
-            while count < COUNT*THREADS {
+            while count < COUNT * THREADS {
                 if q.try_pop().is_some() {
                     count += 1;
                 }
@@ -106,14 +120,12 @@ fn bench_queue_mpmc<Q: Queue<bool> + Sync>(q: Q) -> f64 {
                         }
                     }
                 });
-                scope.spawn(move || {
-                    loop {
-                        if let Some(false) = qr.try_pop() { break }
+                scope.spawn(move || loop {
+                    if let Some(false) = qr.try_pop() {
+                        break;
                     }
                 });
             }
-
-
         });
     });
 
@@ -135,7 +147,7 @@ fn bench_chan_mpsc() -> f64 {
                 });
             }
 
-            for _i in 0..COUNT*THREADS {
+            for _i in 0..COUNT * THREADS {
                 let _ = rx.recv().unwrap();
             }
         });
@@ -153,7 +165,7 @@ fn main() {
     println!("MSQ mpmc: {}", bench_queue_mpmc(MsQueue::new()));
     println!("Seg mpmc: {}", bench_queue_mpmc(SegQueue::new()));
 
-//    println!("queue_mpsc: {}", bench_queue_mpsc());
-//    println!("queue_mpmc: {}", bench_queue_mpmc());
-//   println!("mutex_mpmc: {}", bench_mutex_mpmc());
+    // println!("queue_mpsc: {}", bench_queue_mpsc());
+    // println!("queue_mpmc: {}", bench_queue_mpmc());
+    // println!("mutex_mpmc: {}", bench_mutex_mpmc());
 }

src/bin/extra_impls/mpsc_queue.rs

@@ -80,8 +80,8 @@ impl<T> fmt::Debug for Queue<T> {
     }
 }
 
-unsafe impl<T: Send> Send for Queue<T> { }
-unsafe impl<T: Send> Sync for Queue<T> { }
+unsafe impl<T: Send> Send for Queue<T> {}
+unsafe impl<T: Send> Sync for Queue<T> {}
 
 impl<T> Node<T> {
     unsafe fn new(v: Option<T>) -> *mut Node<T> {
@@ -136,7 +136,11 @@ impl<T> Queue<T> {
                 return Data(ret);
             }
 
-            if self.head.load(Ordering::Acquire) == tail {Empty} else {Inconsistent}
+            if self.head.load(Ordering::Acquire) == tail {
+                Empty
+            } else {
+                Inconsistent
+            }
         }
     }
 }

src/bin/stress-msq.rs

@@ -16,7 +16,9 @@ fn main() {
             let qs = q.clone();
 
             s.spawn(move || {
-                for i in 1..COUNT { qs.push(i) }
+                for i in 1..COUNT {
+                    qs.push(i)
+                }
             });
 
             for _i in 0..THREADS {