auto merge of #13930 : alexcrichton/rust/snapshots, r=huonw

cc @pcwalton and @flaper87, this has box expressions and opt-in builtin kinds.

3 files changed, 0 insertions, 6 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 {