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

Author: bors

src/compiletest/compiletest.rs

@@ -13,7 +13,6 @@
 #[allow(non_camel_case_types)];
 #[deny(warnings)];
 
-#[cfg(stage0)] extern mod green;
 extern mod extra;
 
 use std::os;

src/driver/driver.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[cfg(stage0)] extern mod green;
-
 #[cfg(rustpkg)]
 extern mod this = "rustpkg";
 

src/libgreen/lib.rs

@@ -25,9 +25,6 @@
 // NB this does *not* include globs, please keep it that way.
 #[feature(macro_rules)];
 
-// Allow check-stage0-green for now
-#[cfg(test, stage0)] extern mod green;
-
 use std::os;
 use std::rt::crate_map;
 use std::rt::rtio;

src/libnative/lib.rs

@@ -19,9 +19,6 @@
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];
 
-// Allow check-stage0-native for now
-#[cfg(stage0, test)] extern mod green;
-
 // NB this crate explicitly does *not* allow glob imports, please seriously
 //    consider whether they're needed before adding that feature here (the
 //    answer is that you don't need them)

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> {

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

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;

src/snapshots.txt

@@ -1,3 +1,11 @@
+S 2014-01-05 a6d3e57
+  freebsd-x86_64 ac21ea9537da2aaee35b7f3d2698b651dc3e8bd9
+  linux-i386 03e60be1f1b90dddd15f3597bc45ec8d9626b35d
+  linux-x86_64 aa8fbbacdb1d8a078f3a3fe3478dcbc506bd4090
+  macos-i386 48678a07106207de939f0f90389abb3170b20531
+  macos-x86_64 ec746585cb20d1f9edffec74f6ff8be6e93a75f7
+  winnt-i386 5c6e697a9a7946f9f15dbe7d5936cc9875ce7636
+
 S 2013-12-27 a5fa1d9
   freebsd-x86_64 7ed0226bb924d40bebda19e7bb0a7663233a600c
   linux-i386 10c113aa925f9985b5111ded570b7db4a50b8569