auto merge of #12026 : alexcrichton/rust/snapshots, r=cmr

Author: bors

src/libextra/lib.rs

@@ -34,11 +34,6 @@ Rust extras are part of the standard Rust distribution.
 #[deny(non_camel_case_types)];
 #[deny(missing_doc)];
 
-#[cfg(stage0)]
-macro_rules! if_ok (
-    ($e:expr) => (match $e { Ok(e) => e, Err(e) => return Err(e) })
-)
-
 // Utility modules
 
 pub mod c_vec;

src/librustc/lib.rs

@@ -54,11 +54,6 @@ use syntax::diagnostic::Emitter;
 use syntax::diagnostic;
 use syntax::parse;
 
-#[cfg(stage0)]
-macro_rules! if_ok (
-    ($e:expr) => (match $e { Ok(e) => e, Err(e) => return Err(e) })
-)
-
 pub mod middle {
     pub mod trans;
     pub mod ty;

src/libstd/fmt/mod.rs

@@ -493,11 +493,6 @@ use util;
 use vec::ImmutableVector;
 use vec;
 
-// NOTE this is just because the `prelude::*` import above includes
-// default::Default, so the reexport doesn't work.
-#[cfg(stage0)]
-pub use Default = fmt::Show; // export required for `format!()` etc.
-
 pub mod parse;
 pub mod rt;
 

src/libstd/reflect.rs

@@ -446,15 +446,4 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
         if ! self.inner.visit_type() { return false; }
         true
     }
-
-    // NOTE remove after next snapshot
-    #[cfg(stage0)]
-    fn visit_closure_ptr(&mut self, ck: uint) -> bool {
-        self.align_to::<proc()>();
-        if ! self.inner.visit_closure_ptr(ck) {
-            return false
-        }
-        self.bump_past::<proc()>();
-        true
-    }
 }

src/libstd/repr.rs

@@ -602,10 +602,6 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
     fn visit_param(&mut self, _i: uint) -> bool { true }
     fn visit_self(&mut self) -> bool { true }
     fn visit_type(&mut self) -> bool { true }
-
-    // NOTE remove after next snapshot
-    #[cfg(stage0)]
-    fn visit_closure_ptr(&mut self, _ck: uint) -> bool { true }
 }
 
 pub fn write_repr<T>(writer: &mut io::Writer, object: &T) -> io::IoResult<()> {