---

yaml
---
r: 167879
b: refs/heads/master
c: 6002c13
h: refs/heads/master
i:
  167877: 78b6876
  167875: 3fbe9a1
  167871: 7d6b6c4
v: v3

Author: Jorge Aparicio

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: de1446680cab4102cef9d0e133f1b835574926eb
+refs/heads/master: 6002c13f9bbf2957861a66737df9c9599dcee4be
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c89417130f042c58adc60012e7cddc4ef70b70b9
 refs/heads/try: 5204084bd2e46af7cc6e0147430e44dd0d657bbb

trunk/src/librustc_typeck/lib.rs

@@ -104,9 +104,6 @@ use syntax::print::pprust::*;
 use syntax::{ast, ast_map, abi};
 use syntax::ast_util::local_def;
 
-#[cfg(stage0)]
-mod diagnostics;
-
 mod check;
 mod rscope;
 mod astconv;

trunk/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>;
 

trunk/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;

trunk/src/snapshots.txt

@@ -1,3 +1,12 @@
+S 2015-01-02 c894171
+  freebsd-x86_64 ea8bcf75eada3539f5cbab51708eecf40d436b77
+  linux-i386 646ae265721e3cbe19404aae4fea4ffa1f1d90cf
+  linux-x86_64 85183ce0724af3dfb7616b9e81a4e5510415f351
+  macos-i386 b3eced7fc5e78f767edb4595dfcde02dad206f3f
+  macos-x86_64 36418bce8c18f1b49ec6b5aec2bf35ff1cd833a3
+  winnt-i386 6c7ddf23b389be723d34ab91a9baa4a06c5f9571
+  winnt-x86_64 d086d4019d603db09166d0609a21da8ee8fe306a
+
 S 2015-01-01 7d4f487
   freebsd-x86_64 5dc87adb17bc33abc08f1bf4c092e0b5b92a6ca4
   linux-i386 63bf82a5b540d8acbbf1e445ce48be0fa0f003fc