diff options
| author | bors <bors@rust-lang.org> | 2014-09-08 10:06:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-09-08 10:06:15 +0000 |
| commit | ab7b1c896d5d929f3e150bf62c69b1459427a538 (patch) | |
| tree | 0c20aae77a7812ffd870b1f2bfe1b02a39a16c52 | |
| parent | a39f69f91d47fe2262eb985b867a1085f6b8ecd4 (diff) | |
| parent | 524e1b20af044d830c4ebc67612a7e43c58201db (diff) | |
| download | rust-ab7b1c896d5d929f3e150bf62c69b1459427a538.tar.gz rust-ab7b1c896d5d929f3e150bf62c69b1459427a538.zip | |
auto merge of #17063 : huonw/rust/snap, r=alexcrichton
Closes #16880.
| -rw-r--r-- | src/libstd/io/mod.rs | 16 | ||||
| -rw-r--r-- | src/snapshots.txt | 8 |
2 files changed, 8 insertions, 16 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index bd4ec797159..0d0c9e933b0 100644 --- 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 index 9fcaa30cf5f..359b253d6b8 100644 --- 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 |