---

yaml
---
r: 29943
b: refs/heads/incoming
c: bd736a0
h: refs/heads/master
i:
  29941: f56056f
  29939: 0d2d3d2
  29935: 88f7a8e
v: v3

Author: bblum

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 1aa50bba7c11b8d3e2e66bd55913214fcb05a3cc
+refs/heads/incoming: bd736a0f9b8f8be46c256f1de04cd1e3798762c9
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/unsafe.rs

@@ -330,7 +330,6 @@ impl<T: send> Exclusive<T> {
 }
 
 // FIXME(#2585) make this a by-move method on the exclusive
-#[cfg(stage1)]
 fn unwrap_exclusive<T: send>(+arc: Exclusive<T>) -> T {
     let Exclusive { x: x } = arc;
     let inner = unsafe { unwrap_shared_mutable_state(x) };
@@ -426,14 +425,12 @@ mod tests {
     }
 
     #[test]
-    #[cfg(stage1)]
     fn exclusive_unwrap_basic() {
         let x = exclusive(~~"hello");
         assert unwrap_exclusive(x) == ~~"hello";
     }
 
     #[test]
-    #[cfg(stage1)]
     fn exclusive_unwrap_contended() {
         let x = exclusive(~~"hello");
         let x2 = ~mut some(x.clone());
@@ -459,7 +456,6 @@ mod tests {
     }
 
     #[test] #[should_fail] #[ignore(cfg(windows))]
-    #[cfg(stage1)]
     fn exclusive_unwrap_conflict() {
         let x = exclusive(~~"hello");
         let x2 = ~mut some(x.clone());
@@ -474,7 +470,6 @@ mod tests {
     }
 
     #[test] #[ignore(cfg(windows))]
-    #[cfg(stage1)]
     fn exclusive_unwrap_deadlock() {
         // This is not guaranteed to get to the deadlock before being killed,
         // but it will show up sometimes, and if the deadlock were not there,

branches/incoming/src/libstd/arc.rs

@@ -93,7 +93,6 @@ fn clone<T: const send>(rc: &arc<T>) -> arc<T> {
     arc { x: unsafe { clone_shared_mutable_state(&rc.x) } }
 }
 
-#[cfg(stage1)]
 fn unwrap<T: const send>(+rc: arc<T>) -> T {
     let arc { x: x } = rc;
     unsafe { unwrap_shared_mutable_state(x) }
@@ -188,7 +187,6 @@ impl<T: send> &mutex_arc<T> {
 }
 
 // FIXME(#2585) make this a by-move method on the arc
-#[cfg(stage1)]
 fn unwrap_mutex_arc<T: send>(+arc: mutex_arc<T>) -> T {
     let mutex_arc { x: x } = arc;
     let inner = unsafe { unwrap_shared_mutable_state(x) };
@@ -366,7 +364,6 @@ impl<T: const send> &rw_arc<T> {
 }
 
 // FIXME(#2585) make this a by-move method on the arc
-#[cfg(stage1)]
 fn unwrap_rw_arc<T: const send>(+arc: rw_arc<T>) -> T {
     let rw_arc { x: x, _ } = arc;
     let inner = unsafe { unwrap_shared_mutable_state(x) };
@@ -527,7 +524,6 @@ mod tests {
         }
     }
     #[test] #[should_fail] #[ignore(cfg(windows))]
-    #[cfg(stage1)]
     fn test_mutex_arc_unwrap_poison() {
         let arc = mutex_arc(1);
         let arc2 = ~(&arc).clone();