Skip to content

Commit 3f83c7b

Browse files
committed
---
yaml --- r: 236529 b: refs/heads/tmp c: 97f2a32 h: refs/heads/master i: 236527: bd589e3 v: v3
1 parent 9ffbcde commit 3f83c7b

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2626
refs/heads/beta: d2e13e822a73e0ea46ae9e21afdd3155fc997f6d
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
28-
refs/heads/tmp: e9946f99b97fa1efda39b657448aae0238b66220
28+
refs/heads/tmp: 97f2a325644eb88b50fb5b52e09933535fa29c40
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/src/libcollections/lib.rs

Lines changed: 1 addition & 1 deletion
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]

branches/tmp/src/libcollections/vec.rs

Lines changed: 4 additions & 8 deletions
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)