6 files changed, 8 insertions, 10 deletions
diff --git a/src/libstd/intrinsics.rs b/src/libstd/intrinsics.rs
index 09cdad94305..c2d39ad990a 100644
--- a/src/libstd/intrinsics.rs
+++ b/src/libstd/intrinsics.rs
@@ -95,7 +95,6 @@ pub trait TyVisitor {
 
     fn visit_f32(&mut self) -> bool;
     fn visit_f64(&mut self) -> bool;
-    #[cfg(not(stage0))]
     fn visit_f128(&mut self) -> bool;
 
     fn visit_char(&mut self) -> bool;
@@ -341,21 +340,18 @@ extern "rust-intrinsic" {
     /// `min_align_of::<T>()`
     ///
     /// The volatile parameter parameter is set to `true`, so it will not be optimized out.
-    #[cfg(not(stage0))]
     pub fn volatile_copy_nonoverlapping_memory<T>(dst: *mut T, src: *T, count: uint);
     /// Equivalent to the appropriate `llvm.memmove.p0i8.0i8.*` intrinsic, with
     /// a size of `count` * `size_of::<T>()` and an alignment of
     /// `min_align_of::<T>()`
     ///
     /// The volatile parameter parameter is set to `true`, so it will not be optimized out.
-    #[cfg(not(stage0))]
     pub fn volatile_copy_memory<T>(dst: *mut T, src: *T, count: uint);
     /// Equivalent to the appropriate `llvm.memset.p0i8.*` intrinsic, with a
     /// size of `count` * `size_of::<T>()` and an alignment of
     /// `min_align_of::<T>()`.
     ///
     /// The volatile parameter parameter is set to `true`, so it will not be optimized out.
-    #[cfg(not(stage0))]
     pub fn volatile_set_memory<T>(dst: *mut T, val: u8, count: uint);
 
     /// Perform a volatile load from the `src` pointer.
diff --git a/src/libstd/reflect.rs b/src/libstd/reflect.rs
index 45f214e26fb..ddfc5b58532 100644
--- a/src/libstd/reflect.rs
+++ b/src/libstd/reflect.rs
@@ -176,7 +176,6 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
         true
     }
 
-    #[cfg(not(stage0))]
     fn visit_f128(&mut self) -> bool {
         self.align_to::<f128>();
         if ! self.inner.visit_f128() { return false; }
diff --git a/src/libstd/repr.rs b/src/libstd/repr.rs
index 29d4f9e36d2..cdcd7c23215 100644
--- a/src/libstd/repr.rs
+++ b/src/libstd/repr.rs
@@ -280,7 +280,6 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
 
     fn visit_f32(&mut self) -> bool { self.write::<f32>() }
     fn visit_f64(&mut self) -> bool { self.write::<f64>() }
-    #[cfg(not(stage0))]
     fn visit_f128(&mut self) -> bool { fail!("not implemented") }
 
     fn visit_char(&mut self) -> bool {
diff --git a/src/snapshots.txt b/src/snapshots.txt
index a9d8247608c..2f0092f48f5 100644
--- a/src/snapshots.txt
+++ b/src/snapshots.txt
@@ -1,3 +1,11 @@
+S 2014-05-04 922c420
+  freebsd-x86_64 635f28dd48340db0c1cdc01adad18866acfc7020
+  linux-i386 360a40acf713e6f2d7fcde0112ae87d8336f320c
+  linux-x86_64 a6dfa69483824d525180ac6040b59beed7df165b
+  macos-i386 75e466423e2183e57a5f02358c6f9210997eae94
+  macos-x86_64 12575c620e163002f6d30d1843564eeae31de7b9
+  winnt-i386 be45073b14691e2b0aa9181d4238cbc310f5ae58
+
 S 2014-04-23 b5dd3f0
   freebsd-x86_64 b6ccb045b9bea4cc4781bc128e047a1c68dc2c17
   linux-i386 9e4e8d2bc70ff5b8db21169f762cb20c4dba6c2c
diff --git a/src/test/compile-fail/deriving-bounds.rs b/src/test/compile-fail/deriving-bounds.rs
index 9d9f5527366..dc0bd5d028a 100644
--- a/src/test/compile-fail/deriving-bounds.rs
+++ b/src/test/compile-fail/deriving-bounds.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//NOTE: Remove in the next snapshot
-#[cfg(not(stage0))]
 #[deriving(Share(Bad),Send,Copy)]
 //~^ ERROR unexpected value in deriving, expected a trait
 struct Test;
diff --git a/src/test/run-pass/deriving-bounds.rs b/src/test/run-pass/deriving-bounds.rs
index a3951584702..ad7ded215af 100644
--- a/src/test/run-pass/deriving-bounds.rs
+++ b/src/test/run-pass/deriving-bounds.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//NOTE: Remove in the next snapshot
-#[cfg(not(stage0))]
 #[deriving(Share,Send,Copy)]
 struct Test;