X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibstd%2Fold_io%2Fmem.rs;h=c92e74fbc565e10b3a84aa46c67b86a630d816d8;hb=82dcec7ee4a8a71fdfb8e8771ae6785261ec1d5b;hp=5f20c383bb7586388901f826f1b9be138e6a6d0d;hpb=ef94b8a9d3e915318029b83e39af63861ca44952;p=rust.git diff --git a/src/libstd/old_io/mem.rs b/src/libstd/old_io/mem.rs index 5f20c383bb7..c92e74fbc56 100644 --- a/src/libstd/old_io/mem.rs +++ b/src/libstd/old_io/mem.rs @@ -168,7 +168,7 @@ fn read(&mut self, buf: &mut [u8]) -> IoResult { let input = &self.buf[self.pos.. self.pos + write_len]; let output = &mut buf[..write_len]; assert_eq!(input.len(), output.len()); - slice::bytes::copy_memory(output, input); + slice::bytes::copy_memory(input, output); } self.pos += write_len; assert!(self.pos <= self.buf.len()); @@ -212,7 +212,7 @@ fn read(&mut self, buf: &mut [u8]) -> IoResult { { let input = &self[..write_len]; let output = &mut buf[.. write_len]; - slice::bytes::copy_memory(output, input); + slice::bytes::copy_memory(input, output); } *self = &self[write_len..]; @@ -287,13 +287,13 @@ fn write_all(&mut self, src: &[u8]) -> IoResult<()> { let src_len = src.len(); if dst_len >= src_len { - slice::bytes::copy_memory(dst, src); + slice::bytes::copy_memory(src, dst); self.pos += src_len; Ok(()) } else { - slice::bytes::copy_memory(dst, &src[..dst_len]); + slice::bytes::copy_memory(&src[..dst_len], dst); self.pos += dst_len; @@ -360,7 +360,7 @@ fn read(&mut self, buf: &mut [u8]) -> IoResult { let input = &self.buf[self.pos.. self.pos + write_len]; let output = &mut buf[..write_len]; assert_eq!(input.len(), output.len()); - slice::bytes::copy_memory(output, input); + slice::bytes::copy_memory(input, output); } self.pos += write_len; assert!(self.pos <= self.buf.len()); @@ -399,7 +399,7 @@ fn fill_buf(&mut self) -> IoResult<&[u8]> { mod test { extern crate test as test_crate; use old_io::{SeekSet, SeekCur, SeekEnd, Reader, Writer, Seek, Buffer}; - use prelude::v1::{Ok, Err, Vec, AsSlice}; + use prelude::v1::{Ok, Err, Vec}; use prelude::v1::Iterator; use old_io; use iter::repeat; @@ -744,7 +744,7 @@ fn bench_buf_writer(b: &mut Bencher) { wr.write(&[5; 10]).unwrap(); } } - assert_eq!(buf.as_slice(), [5; 100].as_slice()); + assert_eq!(&buf[..], &[5; 100][..]); }); }