diff options
| author | bors <bors@rust-lang.org> | 2016-02-27 01:15:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-27 01:15:23 +0000 |
| commit | f1e191c0b959111aef19f3aa06b7f1743419470c (patch) | |
| tree | 489b5291ae5e28a7be0b051978ae1c1fd7f047ef /src/libstd/io | |
| parent | 98a8a71236453a16f0048a65506f4d0bea042ca5 (diff) | |
| parent | 2d6496dd8432c71b65d67c7216fbd4428c06527b (diff) | |
Auto merge of #31914 - bluss:copy-from-slice-everywhere, r=alexcrichton
Use .copy_from_slice() where applicable .copy_from_slice() does the same job of .clone_from_slice(), but the former is explicitly for Copy elements and calls `memcpy` directly, and thus is it efficient without optimization too.
Diffstat (limited to 'src/libstd/io')
| -rw-r--r-- | src/libstd/io/cursor.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/impls.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/io/cursor.rs b/src/libstd/io/cursor.rs index 4573f465819..420fede34d2 100644 --- a/src/libstd/io/cursor.rs +++ b/src/libstd/io/cursor.rs @@ -256,7 +256,7 @@ impl Write for Cursor<Vec<u8>> { let pos = pos as usize; let space = self.inner.len() - pos; let (left, right) = buf.split_at(cmp::min(space, buf.len())); - self.inner[pos..pos + left.len()].clone_from_slice(left); + self.inner[pos..pos + left.len()].copy_from_slice(left); self.inner.extend_from_slice(right); } diff --git a/src/libstd/io/impls.rs b/src/libstd/io/impls.rs index 592e16b0a3c..ec63f14d453 100644 --- a/src/libstd/io/impls.rs +++ b/src/libstd/io/impls.rs @@ -156,7 +156,7 @@ impl<'a> Read for &'a [u8] { fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> { let amt = cmp::min(buf.len(), self.len()); let (a, b) = self.split_at(amt); - buf[..amt].clone_from_slice(a); + buf[..amt].copy_from_slice(a); *self = b; Ok(amt) } @@ -168,7 +168,7 @@ impl<'a> Read for &'a [u8] { "failed to fill whole buffer")); } let (a, b) = self.split_at(buf.len()); - buf.clone_from_slice(a); + buf.copy_from_slice(a); *self = b; Ok(()) } @@ -189,7 +189,7 @@ impl<'a> Write for &'a mut [u8] { fn write(&mut self, data: &[u8]) -> io::Result<usize> { let amt = cmp::min(data.len(), self.len()); let (a, b) = mem::replace(self, &mut []).split_at_mut(amt); - a.clone_from_slice(&data[..amt]); + a.copy_from_slice(&data[..amt]); *self = b; Ok(amt) } |
