about summary refs log tree commit diff
path: root/src/libstd/io
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-01-21 11:56:52 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-01-21 12:49:02 -0800
commitecbee2e56824161fcc0decd087055d13e0876058 (patch)
tree09fb046ceeeb65043efd1b6e141a5694f19e90bc /src/libstd/io
parentdf1cddf20a2a4ece854e5d8592ad3155a3313fd2 (diff)
downloadrust-ecbee2e56824161fcc0decd087055d13e0876058.tar.gz
rust-ecbee2e56824161fcc0decd087055d13e0876058.zip
More test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/io')
-rw-r--r--src/libstd/io/mem.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs
index 786b5a08eed..ec4191297ce 100644
--- a/src/libstd/io/mem.rs
+++ b/src/libstd/io/mem.rs
@@ -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 = &mut buf.slice_to_mut[..write_len];
+            let output = &mut buf[..write_len];
             assert_eq!(input.len(), output.len());
             slice::bytes::copy_memory(output, input);
         }