auto merge of #17063 : huonw/rust/snap, r=alexcrichton

bors · bors · commit ab7b1c896d5d · 2014-09-08T10:06:15.000Z
Closes #16880.
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
@@ -945,12 +945,6 @@ pub trait Reader {
     }
 }
 
-#[cfg(stage0)]
-impl Reader for Box<Reader+'static> {
-    fn read(&mut self, buf: &mut [u8]) -> IoResult<uint> { self.read(buf) }
-}
-
-#[cfg(not(stage0))]
 impl<'a> Reader for Box<Reader+'a> {
     fn read(&mut self, buf: &mut [u8]) -> IoResult<uint> { self.read(buf) }
 }
@@ -1285,16 +1279,6 @@ pub trait Writer {
     }
 }
 
-#[cfg(stage0)]
-impl Writer for Box<Writer+'static> {
-    #[inline]
-    fn write(&mut self, buf: &[u8]) -> IoResult<()> { self.write(buf) }
-
-    #[inline]
-    fn flush(&mut self) -> IoResult<()> { self.flush() }
-}
-
-#[cfg(not(stage0))]
 impl<'a> Writer for Box<Writer+'a> {
     #[inline]
     fn write(&mut self, buf: &[u8]) -> IoResult<()> { self.write(buf) }
diff --git a/src/snapshots.txt b/src/snapshots.txt
@@ -1,3 +1,11 @@
+S 2014-09-05 67b97ab
+  freebsd-x86_64 5ed208394cb2a378ddfaa005b6298d2f142ad47f
+  linux-i386 d90866947bfa09738cf8540d17a8eedc70988fcc
+  linux-x86_64 52955b8f7a3b1bf664345060f421101979ced9f2
+  macos-i386 2a38d39afa94ad6d274464ee4e82b1b98c2b3a11
+  macos-x86_64 51df6e27c7d0776f83023e30a976525934ddb93f
+  winnt-i386 3b0bc6d5c1435f22a3782ae25acd19bc27b2cff4
+
 S 2014-08-29 6025926
   freebsd-x86_64 285330b798eefcc929fc94c9d0604b6172ce3309
   linux-i386 5b57ab2dc32952dc78551a955f3c1746b2d915a3

Original file line number	Diff line number	Diff line change
`@@ -945,12 +945,6 @@ pub trait Reader {`
`945`	`945`	`}`
`946`	`946`	`}`
`947`	`947`
`948`		`-#[cfg(stage0)]`
`949`		`-impl Reader for Box<Reader+'static> {`
`950`		`- fn read(&mut self, buf: &mut [u8]) -> IoResult<uint> { self.read(buf) }`
`951`		`-}`
`952`		`-`
`953`		`-#[cfg(not(stage0))]`
`954`	`948`	`impl<'a> Reader for Box<Reader+'a> {`
`955`	`949`	`fn read(&mut self, buf: &mut [u8]) -> IoResult<uint> { self.read(buf) }`
`956`	`950`	`}`
`@@ -1285,16 +1279,6 @@ pub trait Writer {`
`1285`	`1279`	`}`
`1286`	`1280`	`}`
`1287`	`1281`
`1288`		`-#[cfg(stage0)]`
`1289`		`-impl Writer for Box<Writer+'static> {`
`1290`		`- #[inline]`
`1291`		`- fn write(&mut self, buf: &[u8]) -> IoResult<()> { self.write(buf) }`
`1292`		`-`
`1293`		`- #[inline]`
`1294`		`- fn flush(&mut self) -> IoResult<()> { self.flush() }`
`1295`		`-}`
`1296`		`-`
`1297`		`-#[cfg(not(stage0))]`
`1298`	`1282`	`impl<'a> Writer for Box<Writer+'a> {`
`1299`	`1283`	`#[inline]`
`1300`	`1284`	`fn write(&mut self, buf: &[u8]) -> IoResult<()> { self.write(buf) }`