]> git.lizzy.rs Git - rust.git/blobdiff - src/libstd/io/comm_adapters.rs
Fallout from stabilization.
[rust.git] / src / libstd / io / comm_adapters.rs
index 4b0014c68f7a84289cd17be9d6ff93a986b031e3..4649012d454b0b99e5f1cbe43b8f4f92c2a5f38a 100644 (file)
@@ -72,7 +72,7 @@ fn fill_buf<'a>(&'a mut self) -> IoResult<&'a [u8]> {
         if self.closed {
             Err(io::standard_error(io::EndOfFile))
         } else {
-            Ok(self.buf.slice_from(self.pos))
+            Ok(&self.buf[self.pos..])
         }
     }
 
@@ -88,7 +88,7 @@ fn read(&mut self, buf: &mut [u8]) -> IoResult<uint> {
         loop {
             let count = match self.fill_buf().ok() {
                 Some(src) => {
-                    let dst = buf.slice_from_mut(num_read);
+                    let dst = &mut buf[num_read..];
                     let count = cmp::min(src.len(), dst.len());
                     bytes::copy_memory(dst, &src[..count]);
                     count