diff options
| author | Aaron Turon <aturon@mozilla.com> | 2015-01-17 16:15:52 -0800 |
|---|---|---|
| committer | Aaron Turon <aturon@mozilla.com> | 2015-01-21 08:11:07 -0800 |
| commit | a506d4cbfe8f20a2725c7efd9d43359a0bbd0e9e (patch) | |
| tree | d3cc252236786a58efbdd2b3c4bf3f12af88039e /src/libstd/io/mem.rs | |
| parent | 092ba6a8563b5c95f5aa53a705eaba6cc94e2da7 (diff) | |
| download | rust-a506d4cbfe8f20a2725c7efd9d43359a0bbd0e9e.tar.gz rust-a506d4cbfe8f20a2725c7efd9d43359a0bbd0e9e.zip | |
Fallout from stabilization.
Diffstat (limited to 'src/libstd/io/mem.rs')
| -rw-r--r-- | src/libstd/io/mem.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs index ee05a9e5596..884582cbaa8 100644 --- a/src/libstd/io/mem.rs +++ b/src/libstd/io/mem.rs @@ -160,7 +160,7 @@ impl Reader for MemReader { let write_len = min(buf.len(), self.buf.len() - self.pos); { let input = &self.buf[self.pos.. (self.pos + write_len)]; - let output = buf.slice_to_mut(write_len); + let output = &mut buf[.. write_len]; assert_eq!(input.len(), output.len()); slice::bytes::copy_memory(output, input); } @@ -205,11 +205,11 @@ impl<'a> Reader for &'a [u8] { let write_len = min(buf.len(), self.len()); { let input = &self[..write_len]; - let output = buf.slice_to_mut(write_len); + let output = &mut buf[.. write_len]; slice::bytes::copy_memory(output, input); } - *self = self.slice_from(write_len); + *self = &self[write_len..]; Ok(write_len) } @@ -270,7 +270,7 @@ impl<'a> BufWriter<'a> { impl<'a> Writer for BufWriter<'a> { #[inline] fn write(&mut self, src: &[u8]) -> IoResult<()> { - let dst = self.buf.slice_from_mut(self.pos); + let dst = &mut self.buf[self.pos..]; let dst_len = dst.len(); if dst_len == 0 { @@ -350,7 +350,7 @@ impl<'a> Reader for BufReader<'a> { let write_len = min(buf.len(), self.buf.len() - self.pos); { let input = &self.buf[self.pos.. (self.pos + write_len)]; - let output = buf.slice_to_mut(write_len); + let output = &mut buf[.. write_len]; assert_eq!(input.len(), output.len()); slice::bytes::copy_memory(output, input); } |
