about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-10-08 05:55:13 +0000
committerbors <bors@rust-lang.org>2017-10-08 05:55:13 +0000
commitf338dba29705e144bad8b2a675284538dd514896 (patch)
tree10480da46e8c7562ec48408dca191b6e8d9c7fa3 /src/libstd
parent928a295718d252a908bffcbde747550510407a10 (diff)
parent7914e6fbc075f7f485fca4ab589563da4e95a9b7 (diff)
downloadrust-f338dba29705e144bad8b2a675284538dd514896.tar.gz
rust-f338dba29705e144bad8b2a675284538dd514896.zip
Auto merge of #45100 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests

- Successful merges: #45018, #45042, #45052, #45053, #45058, #45060, #45081, #45083, #45090, #45094
- Failed merges:
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/io/impls.rs8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/libstd/io/impls.rs b/src/libstd/io/impls.rs
index d6b41ceda43..fe1179a3b4a 100644
--- a/src/libstd/io/impls.rs
+++ b/src/libstd/io/impls.rs
@@ -206,6 +206,14 @@ impl<'a> Read for &'a [u8] {
         *self = b;
         Ok(())
     }
+
+    #[inline]
+    fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> {
+        buf.extend_from_slice(*self);
+        let len = self.len();
+        *self = &self[len..];
+        Ok(len)
+    }
 }
 
 #[stable(feature = "rust1", since = "1.0.0")]