Skip to content

Commit 97f2a32

Browse files
committed
Optimize Vec::clone_from
Before: test dst_bigger::src_100_dst_1000::clone ... bench: 34 ns/iter (+/- 1) test dst_bigger::src_100_dst_1000::clone_from ... bench: 75 ns/iter (+/- 3) test dst_bigger::src_10_dst_100::clone ... bench: 25 ns/iter (+/- 0) test dst_bigger::src_10_dst_100::clone_from ... bench: 9 ns/iter (+/- 1) test eq::src_1000_dst_1000::clone ... bench: 105 ns/iter (+/- 2) test eq::src_1000_dst_1000::clone_from ... bench: 593 ns/iter (+/- 21) test eq::src_100_dst_100::clone ... bench: 34 ns/iter (+/- 1) test eq::src_100_dst_100::clone_from ... bench: 75 ns/iter (+/- 1) test src_bigger::src_1000_dst_100::clone ... bench: 103 ns/iter (+/- 5) test src_bigger::src_1000_dst_100::clone_from ... bench: 148 ns/iter (+/- 5) test src_bigger::src_100_dst_10::clone ... bench: 34 ns/iter (+/- 1) test src_bigger::src_100_dst_10::clone_from ... bench: 20 ns/iter (+/- 0) After: test dst_bigger::src_100_dst_1000::clone ... bench: 34 ns/iter (+/- 2) test dst_bigger::src_100_dst_1000::clone_from ... bench: 15 ns/iter (+/- 1) test dst_bigger::src_10_dst_100::clone ... bench: 26 ns/iter (+/- 1) test dst_bigger::src_10_dst_100::clone_from ... bench: 7 ns/iter (+/- 0) test eq::src_1000_dst_1000::clone ... bench: 103 ns/iter (+/- 1) test eq::src_1000_dst_1000::clone_from ... bench: 85 ns/iter (+/- 4) test eq::src_100_dst_100::clone ... bench: 34 ns/iter (+/- 2) test eq::src_100_dst_100::clone_from ... bench: 15 ns/iter (+/- 1) test src_bigger::src_1000_dst_100::clone ... bench: 103 ns/iter (+/- 4) test src_bigger::src_1000_dst_100::clone_from ... bench: 90 ns/iter (+/- 2) test src_bigger::src_100_dst_10::clone ... bench: 34 ns/iter (+/- 2) test src_bigger::src_100_dst_10::clone_from ... bench: 20 ns/iter (+/- 0) Closes #28601.
1 parent e9946f9 commit 97f2a32

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

src/libcollections/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
#![feature(unsafe_no_drop_flag, filling_drop)]
6363
#![feature(decode_utf16)]
6464
#![feature(utf8_error)]
65-
#![cfg_attr(test, feature(rand, test))]
65+
#![cfg_attr(test, feature(clone_from_slice, rand, test))]
6666

6767
#![feature(no_std)]
6868
#![no_std]

src/libcollections/vec.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -1007,19 +1007,15 @@ impl<T:Clone> Clone for Vec<T> {
10071007

10081008
fn clone_from(&mut self, other: &Vec<T>) {
10091009
// drop anything in self that will not be overwritten
1010-
if self.len() > other.len() {
1011-
self.truncate(other.len())
1012-
}
1010+
self.truncate(other.len());
1011+
let len = self.len();
10131012

10141013
// reuse the contained values' allocations/resources.
1015-
for (place, thing) in self.iter_mut().zip(other) {
1016-
place.clone_from(thing)
1017-
}
1014+
self.clone_from_slice(&other[..len]);
10181015

10191016
// self.len <= other.len due to the truncate above, so the
10201017
// slice here is always in-bounds.
1021-
let slice = &other[self.len()..];
1022-
self.push_all(slice);
1018+
self.push_all(&other[len..]);
10231019
}
10241020
}
10251021

0 commit comments

Comments
 (0)