about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-06-01 00:28:44 -0700
committerbors <bors@rust-lang.org>2016-06-01 00:28:44 -0700
commit806a5535dac1afe79176ea7053661953c89eaa5e (patch)
tree99d22a2009b161f10079a54f94fd3cd754c51910 /src/libstd
parent433d70cda2e6d61d5bbb20423f0937a643cf34b4 (diff)
parent42e593a540ac5b08d4bd1cb6fd3d0fcb9ae74a8f (diff)
downloadrust-806a5535dac1afe79176ea7053661953c89eaa5e.tar.gz
rust-806a5535dac1afe79176ea7053661953c89eaa5e.zip
Auto merge of #34004 - Manishearth:rollup, r=Manishearth
Rollup of 11 pull requests

- Successful merges: #33385, #33606, #33841, #33892, #33896, #33915, #33921, #33967, #33970, #33973, #33977
- Failed merges:
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/io/cursor.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/io/cursor.rs b/src/libstd/io/cursor.rs
index a1002fdb645..2d780559db1 100644
--- a/src/libstd/io/cursor.rs
+++ b/src/libstd/io/cursor.rs
@@ -230,6 +230,7 @@ impl<T> BufRead for Cursor<T> where T: AsRef<[u8]> {
 
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<'a> Write for Cursor<&'a mut [u8]> {
+    #[inline]
     fn write(&mut self, data: &[u8]) -> io::Result<usize> {
         let pos = cmp::min(self.pos, self.inner.len() as u64);
         let amt = (&mut self.inner[(pos as usize)..]).write(data)?;
@@ -269,6 +270,7 @@ impl Write for Cursor<Vec<u8>> {
 
 #[stable(feature = "cursor_box_slice", since = "1.5.0")]
 impl Write for Cursor<Box<[u8]>> {
+    #[inline]
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         let pos = cmp::min(self.pos, self.inner.len() as u64);
         let amt = (&mut self.inner[(pos as usize)..]).write(buf)?;