rollup merge of #20708: aturon/new-int-modules

Conflicts:
	src/libserialize/lib.rs

3 files changed, 0 insertions, 23 deletions

diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs
index 9c105d1148a..a3adc09b581 100644
--- a/src/libcollections/lib.rs
+++ b/src/libcollections/lib.rs
@@ -102,8 +102,6 @@ mod std {
     pub use core::option;   // necessary for panic!()
     pub use core::clone;    // deriving(Clone)
     pub use core::cmp;      // deriving(Eq, Ord, etc.)
-    #[cfg(stage0)]
-    pub use core::marker as kinds;
     pub use core::marker;  // deriving(Copy)
     pub use core::hash;     // deriving(Hash)
 }
diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs
index 0d91a5d4a64..2d8fd159159 100644
--- a/src/libcollections/string.rs
+++ b/src/libcollections/string.rs
@@ -930,18 +930,6 @@ pub trait ToString {
     fn to_string(&self) -> String;
 }
 
-#[cfg(stage0)]
-impl<T: fmt::Show> ToString for T {
-    fn to_string(&self) -> String {
-        use core::fmt::Writer;
-        let mut buf = String::new();
-        let _ = buf.write_fmt(format_args!("{}", self));
-        buf.shrink_to_fit();
-        buf
-    }
-}
-
-#[cfg(not(stage0))]
 impl<T: fmt::String> ToString for T {
     fn to_string(&self) -> String {
         use core::fmt::Writer;
diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs
index ed86eaa3080..c2de5d24025 100644
--- a/src/libcollections/vec.rs
+++ b/src/libcollections/vec.rs
@@ -1462,15 +1462,6 @@ impl<T: fmt::Show> fmt::Show for Vec<T> {
     }
 }
 
-#[cfg(stage0)]
-#[experimental = "waiting on Show stability"]
-impl<T: fmt::Show> fmt::String for Vec<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fmt::String::fmt(self.as_slice(), f)
-    }
-}
-
-#[cfg(not(stage0))]
 #[experimental = "waiting on Show stability"]
 impl<T: fmt::String> fmt::String for Vec<T> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {