Skip to content

Commit 23701ef

Browse files
committed
---
yaml --- r: 174313 b: refs/heads/snap-stage3 c: a833337 h: refs/heads/master i: 174311: 0de313e v: v3
1 parent aa47f49 commit 23701ef

File tree

2 files changed

+47
-1
lines changed

2 files changed

+47
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: a833337943300db1c310a4cf9c84b7b4ef4e9468
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 8b2335a01d000300cca7d8b12210e605424eedb4
4+
refs/heads/snap-stage3: a833337943300db1c310a4cf9c84b7b4ef4e9468
55
refs/heads/try: 08f6380a9f0b866796080094f44fe25ea5636547
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/libcollections/vec.rs

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,43 @@ impl<T> Vec<T> {
681681
}
682682
}
683683

684+
/// Moves all the elements of `other` into `Self`, leaving `other` empty.
685+
///
686+
/// # Panics
687+
///
688+
/// Panics if the number of elements in the vector overflows a `uint`.
689+
///
690+
/// # Examples
691+
/// ```rust
692+
/// let mut vec = vec![1, 2, 3];
693+
/// let mut vec2 = vec![4, 5, 6];
694+
/// vec.append(&mut vec2);
695+
/// assert_eq!(vec, vec![1, 2, 3, 4, 5, 6]);
696+
/// assert_eq!(vec2, vec![]);
697+
/// ```
698+
#[inline]
699+
#[unstable = "new API, waiting for dust to settle"]
700+
pub fn append(&mut self, other: &mut Self) {
701+
if mem::size_of::<T>() == 0 {
702+
// zero-size types consume no memory, so we can't rely on the
703+
// address space running out
704+
self.len = self.len.checked_add(other.len()).expect("length overflow");
705+
unsafe { other.set_len(0) }
706+
return;
707+
}
708+
self.reserve(other.len());
709+
let len = self.len();
710+
unsafe {
711+
ptr::copy_nonoverlapping_memory(
712+
self.get_unchecked_mut(len),
713+
other.as_ptr(),
714+
other.len());
715+
}
716+
717+
self.len += other.len();
718+
unsafe { other.set_len(0); }
719+
}
720+
684721
/// Creates a draining iterator that clears the `Vec` and iterates over
685722
/// the removed items from start to end.
686723
///
@@ -2290,6 +2327,15 @@ mod tests {
22902327
assert_eq!(ys.as_slice(), [1u, 2, 3]);
22912328
}
22922329

2330+
#[test]
2331+
fn test_append() {
2332+
let mut vec = vec![1, 2, 3];
2333+
let mut vec2 = vec![4, 5, 6];
2334+
vec.append(&mut vec2);
2335+
assert_eq!(vec, vec![1, 2, 3, 4, 5, 6]);
2336+
assert_eq!(vec2, vec![]);
2337+
}
2338+
22932339
#[bench]
22942340
fn bench_new(b: &mut Bencher) {
22952341
b.iter(|| {

0 commit comments

Comments
 (0)