Auto merge of #23482 - alexcrichton:snapshots, r=aturon

5 files changed, 0 insertions, 23 deletions

diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs
index a7825c4f93a..11e2b8dca1b 100644
--- a/src/libstd/num/f32.rs
+++ b/src/libstd/num/f32.rs
@@ -357,7 +357,6 @@ impl Float for f32 {
     }
 }
 
-#[cfg(not(stage0))]
 #[cfg(not(test))]
 #[lang = "f32"]
 #[stable(feature = "rust1", since = "1.0.0")]
diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs
index f3978cae485..650f642220f 100644
--- a/src/libstd/num/f64.rs
+++ b/src/libstd/num/f64.rs
@@ -366,7 +366,6 @@ impl Float for f64 {
     }
 }
 
-#[cfg(not(stage0))]
 #[cfg(not(test))]
 #[lang = "f64"]
 #[stable(feature = "rust1", since = "1.0.0")]
diff --git a/src/libstd/num/float_macros.rs b/src/libstd/num/float_macros.rs
index ece7af9c152..60a548b596b 100644
--- a/src/libstd/num/float_macros.rs
+++ b/src/libstd/num/float_macros.rs
@@ -11,17 +11,6 @@
 #![unstable(feature = "std_misc")]
 #![doc(hidden)]
 
-#[cfg(stage0)]
-macro_rules! assert_approx_eq {
-    ($a:expr, $b:expr) => ({
-        use num::Float;
-        let (a, b) = (&$a, &$b);
-        assert!((*a - *b).abs() < 1.0e-6,
-                "{} is not approximately equal to {}", *a, *b);
-    })
-}
-
-#[cfg(not(stage0))]
 macro_rules! assert_approx_eq {
     ($a:expr, $b:expr) => ({
         let (a, b) = (&$a, &$b);
diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs
index 599f3f02a8b..37f1f691776 100644
--- a/src/libstd/num/mod.rs
+++ b/src/libstd/num/mod.rs
@@ -23,9 +23,6 @@ use marker::Copy;
 use clone::Clone;
 use cmp::{PartialOrd, PartialEq};
 
-#[cfg(stage0)]
-pub use core::num::{Int, SignedInt, UnsignedInt};
-#[cfg(not(stage0))]
 pub use core::num::{Int, SignedInt};
 pub use core::num::{cast, FromPrimitive, NumCast, ToPrimitive};
 pub use core::num::{from_int, from_i8, from_i16, from_i32, from_i64};
diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs
index ea1e05df85f..66826b359e6 100644
--- a/src/libstd/num/strconv.rs
+++ b/src/libstd/num/strconv.rs
@@ -16,17 +16,10 @@ use self::ExponentFormat::*;
 use self::SignificantDigits::*;
 use self::SignFormat::*;
 
-#[cfg(stage0)]
-use char::{self, CharExt};
-#[cfg(not(stage0))]
 use char;
 use num::{self, Int, Float, ToPrimitive};
 use num::FpCategory as Fp;
 use ops::FnMut;
-#[cfg(stage0)]
-use slice::SliceExt;
-#[cfg(stage0)]
-use str::StrExt;
 use string::String;
 use vec::Vec;