auto merge of #11348 : alexcrichton/rust/snapshots, r=brson

3 files changed, 2 insertions, 32 deletions

diff --git a/src/libstd/cell.rs b/src/libstd/cell.rs
index c5fdddfec76..62fc08fd9d3 100644
--- a/src/libstd/cell.rs
+++ b/src/libstd/cell.rs
@@ -21,33 +21,6 @@ pub struct Cell<T> {
     priv value: T,
 }
 
-#[cfg(stage0)]
-impl<T> Cell<T> {
-    /// Creates a new `Cell` containing the given value.
-    pub fn new(value: T) -> Cell<T> {
-        Cell {
-            value: value,
-        }
-    }
-
-    /// Returns a copy of the contained value.
-    #[inline]
-    pub fn get(&self) -> T {
-        unsafe {
-            ::cast::transmute_copy(&self.value)
-        }
-    }
-
-    /// Sets the contained value.
-    #[inline]
-    pub fn set(&self, value: T) {
-        unsafe {
-            *cast::transmute_mut(&self.value) = value
-        }
-    }
-}
-
-#[cfg(not(stage0))]
 impl<T: ::kinds::Pod> Cell<T> {
     /// Creates a new `Cell` containing the given value.
     pub fn new(value: T) -> Cell<T> {
diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs
index 3efa979e515..27f9f0dbfa3 100644
--- a/src/libstd/rt/task.rs
+++ b/src/libstd/rt/task.rs
@@ -38,9 +38,6 @@ use sync::atomics::{AtomicUint, SeqCst};
 use task::{TaskResult, TaskOpts};
 use unstable::finally::Finally;
 
-#[cfg(stage0)]
-pub use rt::unwind::begin_unwind;
-
 // The Task struct represents all state associated with a rust
 // task. There are at this point two primary "subtypes" of task,
 // however instead of using a subtype we just have a "task_type" field
diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs
index 9acc09dfcc6..d6b33fda745 100644
--- a/src/libstd/unstable/intrinsics.rs
+++ b/src/libstd/unstable/intrinsics.rs
@@ -188,8 +188,8 @@ extern "rust-intrinsic" {
     /// Execute a breakpoint trap, for inspection by a debugger.
     pub fn breakpoint();
 
-    #[cfg(not(stage0))] pub fn volatile_load<T>(src: *T) -> T;
-    #[cfg(not(stage0))] pub fn volatile_store<T>(dst: *mut T, val: T);
+    pub fn volatile_load<T>(src: *T) -> T;
+    pub fn volatile_store<T>(dst: *mut T, val: T);
 
     /// Atomic compare and exchange, sequentially consistent.
     pub fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;