From 6002c13f9bbf2957861a66737df9c9599dcee4be Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaricious@gmail.com>
Date: Sat, 3 Jan 2015 07:16:22 -0500
Subject: Register new snapshots

---
 src/libstd/io/mod.rs      | 24 ------------------------
 src/libstd/prelude/mod.rs |  3 ---
 2 files changed, 27 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index 4c9c7beb475..917ffa4ff76 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -1036,7 +1036,6 @@ pub trait Writer {
             error: IoResult<()>,
         }
 
-        #[cfg(not(stage0))]
         impl<'a, Sized? T: Writer> fmt::Writer for Adaptor<'a, T> {
             fn write_str(&mut self, s: &str) -> fmt::Result {
                 match self.inner.write(s.as_bytes()) {
@@ -1049,19 +1048,6 @@ pub trait Writer {
             }
         }
 
-        #[cfg(stage0)]
-        impl<'a, T: Writer> fmt::Writer for Adaptor<'a, T> {
-            fn write_str(&mut self, s: &str) -> fmt::Result {
-                match self.inner.write(s.as_bytes()) {
-                    Ok(()) => Ok(()),
-                    Err(e) => {
-                        self.error = Err(e);
-                        Err(fmt::Error)
-                    }
-                }
-            }
-        }
-
         let mut output = Adaptor { inner: self, error: Ok(()) };
         match fmt::write(&mut output, fmt) {
             Ok(()) => Ok(()),
@@ -1652,16 +1638,6 @@ pub struct IncomingConnections<'a, Sized? A:'a> {
     inc: &'a mut A,
 }
 
-#[cfg(stage0)]
-impl<'a, T, A: Acceptor<T>> Iterator for IncomingConnections<'a, A> {
-    type Item = IoResult<T>;
-
-    fn next(&mut self) -> Option<IoResult<T>> {
-        Some(self.inc.accept())
-    }
-}
-
-#[cfg(not(stage0))]
 impl<'a, T, Sized? A: Acceptor<T>> Iterator for IncomingConnections<'a, A> {
     type Item = IoResult<T>;
 
diff --git a/src/libstd/prelude/mod.rs b/src/libstd/prelude/mod.rs
index da945b4c9fa..1fbd17ede08 100644
--- a/src/libstd/prelude/mod.rs
+++ b/src/libstd/prelude/mod.rs
@@ -35,8 +35,5 @@
 //! pervasive that it would be obnoxious to import for every use, particularly
 //! those that define methods on primitive types.
 
-#[cfg(stage0)]
-pub use self::v1::*;
-
 #[stable]
 pub mod v1;
-- 
cgit 1.4.1-3-g733a5