---

yaml
---
r: 95677
b: refs/heads/dist-snap
c: 1916732
h: refs/heads/master
i:
  95675: 84d88a3
v: v3

Author: toffaletti

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 89c91208a7e1e2a5ce77dcb2032601393d861128
+refs/heads/dist-snap: 1916732cfd7efa916da3877ca6e823d18221b04b
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libstd/rt/mpsc_queue.rs

@@ -34,24 +34,20 @@ use ptr::{mut_null, to_mut_unsafe_ptr};
 use cast;
 use option::*;
 use clone::Clone;
-use default::Default;
 use kinds::Send;
-use fmt;
 
 struct Node<T> {
     next: AtomicPtr<Node<T>>,
     value: Option<T>,
 }
 
 impl<T> Node<T> {
-    fn new(value: T) -> Node<T> {
-        Node{next: AtomicPtr::new(mut_null()), value: Some(value)}
+    fn empty() -> Node<T> {
+        Node{next: AtomicPtr::new(mut_null()), value: None}
     }
-}
 
-impl<T> Default for Node<T> {
-    fn default() -> Node<T> {
-        Node{next: AtomicPtr::new(mut_null()), value: None}
+    fn with_value(value: T) -> Node<T> {
+        Node{next: AtomicPtr::new(mut_null()), value: Some(value)}
     }
 }
 
@@ -77,27 +73,23 @@ impl<T: Send> Clone for Queue<T> {
     }
 }
 
-impl<T: Send> fmt::Default for Queue<T> {
-    fn fmt(value: &Queue<T>, f: &mut fmt::Formatter) {
-        write!(f.buf, "Queue({})", value.state.get());
-    }
-}
-
 impl<T: Send> State<T> {
     pub fn new() -> State<T> {
-        let mut state = State {
+        State{
             pad0: [0, ..64],
             head: AtomicPtr::new(mut_null()),
             pad1: [0, ..64],
-            stub: Default::default(),
+            stub: Node::<T>::empty(),
             pad2: [0, ..64],
             tail: mut_null(),
             pad3: [0, ..64],
-        };
-        let stub = state.get_stub_unsafe();
-        state.head.store(stub, Relaxed);
-        state.tail = stub;
-        state
+        }
+    }
+
+    fn init(&mut self) {
+        let stub = self.get_stub_unsafe();
+        self.head.store(stub, Relaxed);
+        self.tail = stub;
     }
 
     fn get_stub_unsafe(&mut self) -> *mut Node<T> {
@@ -106,7 +98,7 @@ impl<T: Send> State<T> {
 
     fn push(&mut self, value: T) {
         unsafe {
-            let node = cast::transmute(~Node::new(value));
+            let node = cast::transmute(~Node::with_value(value));
             self.push_node(node);
         }
     }
@@ -155,7 +147,11 @@ impl<T: Send> State<T> {
 
 impl<T: Send> Queue<T> {
     pub fn new() -> Queue<T> {
-        Queue{state: UnsafeArc::new(State::new())}
+        unsafe {
+            let mut q = Queue{state: UnsafeArc::new(State::new())};
+            (*q.state.get()).init();
+            q
+        }
     }
 
     pub fn push(&mut self, value: T) {