---

brson · brson · commit f541244b2206 · 2013-08-24T15:46:03.000-07:00
yaml --- r: 144364 b: refs/heads/try2 c: 5bcb639 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 761f5fba69edb354cb3a02c01099f00c9bc56dc9
+refs/heads/try2: 5bcb63983680b0953c8125f375e53db8d64a5dc8
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/libstd/rt/message_queue.rs b/branches/try2/src/libstd/rt/message_queue.rs
@@ -20,14 +20,13 @@ use unstable::sync::Exclusive;
 use clone::Clone;
 
 pub struct MessageQueue<T> {
-    // XXX: Another mystery bug fixed by boxing this lock
-    priv queue: ~Exclusive<~[T]>
+    priv queue: Exclusive<~[T]>
 }
 
 impl<T: Send> MessageQueue<T> {
     pub fn new() -> MessageQueue<T> {
         MessageQueue {
-            queue: ~Exclusive::new(~[])
+            queue: Exclusive::new(~[])
         }
     }
 
@@ -51,7 +50,7 @@ impl<T: Send> MessageQueue<T> {
     }
 }
 
-impl<T> Clone for MessageQueue<T> {
+impl<T: Send> Clone for MessageQueue<T> {
     fn clone(&self) -> MessageQueue<T> {
         MessageQueue {
             queue: self.queue.clone()
diff --git a/branches/try2/src/libstd/rt/sleeper_list.rs b/branches/try2/src/libstd/rt/sleeper_list.rs
@@ -20,13 +20,13 @@ use rt::sched::SchedHandle;
 use clone::Clone;
 
 pub struct SleeperList {
-    priv stack: ~Exclusive<~[SchedHandle]>
+    priv stack: Exclusive<~[SchedHandle]>
 }
 
 impl SleeperList {
     pub fn new() -> SleeperList {
         SleeperList {
-            stack: ~Exclusive::new(~[])
+            stack: Exclusive::new(~[])
         }
     }
 
@@ -56,4 +56,4 @@ impl Clone for SleeperList {
             stack: self.stack.clone()
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,13 @@ use unstable::sync::Exclusive;`
`20`	`20`	`use clone::Clone;`
`21`	`21`
`22`	`22`	`pub struct MessageQueue<T> {`
`23`		`- // XXX: Another mystery bug fixed by boxing this lock`
`24`		`- priv queue: ~Exclusive<~[T]>`
	`23`	`+ priv queue: Exclusive<~[T]>`
`25`	`24`	`}`
`26`	`25`
`27`	`26`	`impl<T: Send> MessageQueue<T> {`
`28`	`27`	`pub fn new() -> MessageQueue<T> {`
`29`	`28`	`MessageQueue {`
`30`		`- queue: ~Exclusive::new(~[])`
	`29`	`+ queue: Exclusive::new(~[])`
`31`	`30`	`}`
`32`	`31`	`}`
`33`	`32`
`@@ -51,7 +50,7 @@ impl<T: Send> MessageQueue<T> {`
`51`	`50`	`}`
`52`	`51`	`}`
`53`	`52`
`54`		`-impl<T> Clone for MessageQueue<T> {`
	`53`	`+impl<T: Send> Clone for MessageQueue<T> {`
`55`	`54`	`fn clone(&self) -> MessageQueue<T> {`
`56`	`55`	`MessageQueue {`
`57`	`56`	`queue: self.queue.clone()`
Original file line number	Diff line number	Diff line change
`@@ -20,13 +20,13 @@ use rt::sched::SchedHandle;`
`20`	`20`	`use clone::Clone;`
`21`	`21`
`22`	`22`	`pub struct SleeperList {`
`23`		`- priv stack: ~Exclusive<~[SchedHandle]>`
	`23`	`+ priv stack: Exclusive<~[SchedHandle]>`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`impl SleeperList {`
`27`	`27`	`pub fn new() -> SleeperList {`
`28`	`28`	`SleeperList {`
`29`		`- stack: ~Exclusive::new(~[])`
	`29`	`+ stack: Exclusive::new(~[])`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`@@ -56,4 +56,4 @@ impl Clone for SleeperList {`
`56`	`56`	`stack: self.stack.clone()`
`57`	`57`	`}`
`58`	`58`	`}`
`59`		`-}`
	`59`	`+}`