Skip to content

Commit f1e191c

Browse files
committed
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.
2 parents 98a8a71 + 2d6496d commit f1e191c

File tree

13 files changed

+23
-18
lines changed

13 files changed

+23
-18
lines changed

src/libcore/num/flt2dec/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ impl<'a> Part<'a> {
210210
}
211211
}
212212
Part::Copy(buf) => {
213-
out[..buf.len()].clone_from_slice(buf);
213+
out[..buf.len()].copy_from_slice(buf);
214214
}
215215
}
216216
Some(len)
@@ -245,7 +245,7 @@ impl<'a> Formatted<'a> {
245245
/// (It may still leave partially written bytes in the buffer; do not rely on that.)
246246
pub fn write(&self, out: &mut [u8]) -> Option<usize> {
247247
if out.len() < self.sign.len() { return None; }
248-
out[..self.sign.len()].clone_from_slice(self.sign);
248+
out[..self.sign.len()].copy_from_slice(self.sign);
249249

250250
let mut written = self.sign.len();
251251
for part in self.parts {

src/libcoretest/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#![feature(box_syntax)]
1616
#![feature(cell_extras)]
1717
#![feature(const_fn)]
18+
#![feature(copy_from_slice)]
1819
#![feature(core_float)]
1920
#![feature(core_private_bignum)]
2021
#![feature(core_private_diy_float)]

src/libcoretest/num/flt2dec/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ fn check_exact<F, T>(mut f: F, v: T, vstr: &str, expected: &[u8], expectedk: i16
100100

101101
// check significant digits
102102
for i in 1..cut.unwrap_or(expected.len() - 1) {
103-
expected_[..i].clone_from_slice(&expected[..i]);
103+
expected_[..i].copy_from_slice(&expected[..i]);
104104
let mut expectedk_ = expectedk;
105105
if expected[i] >= b'5' {
106106
// check if this is a rounding-to-even case.
@@ -147,7 +147,7 @@ fn check_exact<F, T>(mut f: F, v: T, vstr: &str, expected: &[u8], expectedk: i16
147147
// check infinite zero digits
148148
if let Some(cut) = cut {
149149
for i in cut..expected.len()-1 {
150-
expected_[..cut].clone_from_slice(&expected[..cut]);
150+
expected_[..cut].copy_from_slice(&expected[..cut]);
151151
for c in &mut expected_[cut..i] { *c = b'0'; }
152152

153153
try_exact!(f(&decoded) => &mut buf, &expected_[..i], expectedk;

src/librbml/lib.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
test(attr(deny(warnings))))]
123123
#![cfg_attr(not(stage0), deny(warnings))]
124124

125+
#![feature(copy_from_slice)]
125126
#![feature(rustc_private)]
126127
#![feature(staged_api)]
127128

@@ -519,7 +520,7 @@ pub mod reader {
519520
// of the page and segfault.
520521

521522
let mut b = [0; 8];
522-
b.clone_from_slice(&d.data[d.end - 8..d.end]);
523+
b.copy_from_slice(&d.data[d.end - 8..d.end]);
523524
let data = unsafe { (*(b.as_ptr() as *const u64)).to_be() };
524525
let len = d.end - d.start;
525526
if len < 8 {
@@ -1043,7 +1044,7 @@ pub mod writer {
10431044
{
10441045
let last_size_pos = last_size_pos as usize;
10451046
let data = &self.writer.get_ref()[last_size_pos + 4..cur_pos as usize];
1046-
buf[..size].clone_from_slice(data);
1047+
buf[..size].copy_from_slice(data);
10471048
}
10481049

10491050
// overwrite the size and data and continue

src/librustc/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#![feature(cell_extras)]
3030
#![feature(collections)]
3131
#![feature(const_fn)]
32+
#![feature(copy_from_slice)]
3233
#![feature(enumset)]
3334
#![feature(iter_arith)]
3435
#![feature(libc)]

src/librustc/middle/dataflow.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ impl<'a, 'tcx, O:DataFlowOperator> DataFlowContext<'a, 'tcx, O> {
489489
let bits = &mut self.scope_kills[start.. end];
490490
debug!("{} add_kills_from_flow_exits flow_exit={:?} bits={} [before]",
491491
self.analysis_name, flow_exit, mut_bits_to_string(bits));
492-
bits.clone_from_slice(&orig_kills[..]);
492+
bits.copy_from_slice(&orig_kills[..]);
493493
debug!("{} add_kills_from_flow_exits flow_exit={:?} bits={} [after]",
494494
self.analysis_name, flow_exit, mut_bits_to_string(bits));
495495
}
@@ -556,7 +556,7 @@ impl<'a, 'b, 'tcx, O:DataFlowOperator> PropagationContext<'a, 'b, 'tcx, O> {
556556
let (start, end) = self.dfcx.compute_id_range(node_index);
557557

558558
// Initialize local bitvector with state on-entry.
559-
in_out.clone_from_slice(&self.dfcx.on_entry[start.. end]);
559+
in_out.copy_from_slice(&self.dfcx.on_entry[start.. end]);
560560

561561
// Compute state on-exit by applying transfer function to
562562
// state on-entry.

src/librustc_back/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#![cfg_attr(not(stage0), deny(warnings))]
3232

3333
#![feature(box_syntax)]
34+
#![feature(copy_from_slice)]
3435
#![feature(libc)]
3536
#![feature(rand)]
3637
#![feature(rustc_private)]

src/librustc_back/sha2.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ impl FixedBuffer for FixedBuffer64 {
134134
let buffer_remaining = size - self.buffer_idx;
135135
if input.len() >= buffer_remaining {
136136
self.buffer[self.buffer_idx..size]
137-
.clone_from_slice(&input[..buffer_remaining]);
137+
.copy_from_slice(&input[..buffer_remaining]);
138138
self.buffer_idx = 0;
139139
func(&self.buffer);
140140
i += buffer_remaining;
141141
} else {
142142
self.buffer[self.buffer_idx..self.buffer_idx + input.len()]
143-
.clone_from_slice(input);
143+
.copy_from_slice(input);
144144
self.buffer_idx += input.len();
145145
return;
146146
}
@@ -157,7 +157,7 @@ impl FixedBuffer for FixedBuffer64 {
157157
// data left in the input vector will be less than the buffer size and the buffer will
158158
// be empty.
159159
let input_remaining = input.len() - i;
160-
self.buffer[..input_remaining].clone_from_slice(&input[i..]);
160+
self.buffer[..input_remaining].copy_from_slice(&input[i..]);
161161
self.buffer_idx += input_remaining;
162162
}
163163

src/libstd/io/cursor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ impl Write for Cursor<Vec<u8>> {
256256
let pos = pos as usize;
257257
let space = self.inner.len() - pos;
258258
let (left, right) = buf.split_at(cmp::min(space, buf.len()));
259-
self.inner[pos..pos + left.len()].clone_from_slice(left);
259+
self.inner[pos..pos + left.len()].copy_from_slice(left);
260260
self.inner.extend_from_slice(right);
261261
}
262262

src/libstd/io/impls.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ impl<'a> Read for &'a [u8] {
156156
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
157157
let amt = cmp::min(buf.len(), self.len());
158158
let (a, b) = self.split_at(amt);
159-
buf[..amt].clone_from_slice(a);
159+
buf[..amt].copy_from_slice(a);
160160
*self = b;
161161
Ok(amt)
162162
}
@@ -168,7 +168,7 @@ impl<'a> Read for &'a [u8] {
168168
"failed to fill whole buffer"));
169169
}
170170
let (a, b) = self.split_at(buf.len());
171-
buf.clone_from_slice(a);
171+
buf.copy_from_slice(a);
172172
*self = b;
173173
Ok(())
174174
}
@@ -189,7 +189,7 @@ impl<'a> Write for &'a mut [u8] {
189189
fn write(&mut self, data: &[u8]) -> io::Result<usize> {
190190
let amt = cmp::min(data.len(), self.len());
191191
let (a, b) = mem::replace(self, &mut []).split_at_mut(amt);
192-
a.clone_from_slice(&data[..amt]);
192+
a.copy_from_slice(&data[..amt]);
193193
*self = b;
194194
Ok(amt)
195195
}

src/libstd/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@
222222
#![feature(collections)]
223223
#![feature(collections_bound)]
224224
#![feature(const_fn)]
225+
#![feature(copy_from_slice)]
225226
#![feature(core_float)]
226227
#![feature(core_intrinsics)]
227228
#![feature(decode_utf16)]

src/libstd/net/parser.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ impl<'a> Parser<'a> {
191191
fn ipv6_addr_from_head_tail(head: &[u16], tail: &[u16]) -> Ipv6Addr {
192192
assert!(head.len() + tail.len() <= 8);
193193
let mut gs = [0; 8];
194-
gs[..head.len()].clone_from_slice(head);
195-
gs[(8 - tail.len()) .. 8].clone_from_slice(tail);
194+
gs[..head.len()].copy_from_slice(head);
195+
gs[(8 - tail.len()) .. 8].copy_from_slice(tail);
196196
Ipv6Addr::new(gs[0], gs[1], gs[2], gs[3], gs[4], gs[5], gs[6], gs[7])
197197
}
198198

src/libstd/sys/common/wtf8.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ impl Wtf8Buf {
341341
Some((surrogate_pos, _)) => {
342342
pos = surrogate_pos + 3;
343343
self.bytes[surrogate_pos..pos]
344-
.clone_from_slice(UTF8_REPLACEMENT_CHARACTER);
344+
.copy_from_slice(UTF8_REPLACEMENT_CHARACTER);
345345
},
346346
None => return unsafe { String::from_utf8_unchecked(self.bytes) }
347347
}

0 commit comments

Comments
 (0)