Skip to content

Commit

Permalink
Optimize VecDeque::append
Browse files Browse the repository at this point in the history
Signed-off-by: tabokie <xy.tao@outlook.com>
  • Loading branch information
tabokie committed Sep 7, 2021
1 parent c4f26b1 commit a456a55
Showing 1 changed file with 28 additions and 2 deletions.
30 changes: 28 additions & 2 deletions library/alloc/src/collections/vec_deque/mod.rs
Expand Up @@ -417,6 +417,26 @@ impl<T, A: Allocator> VecDeque<T, A> {
}
}

/// Append all values from `src` to `self`, wrapping around if needed.
/// Assumes capacity is sufficient.
#[inline]
unsafe fn append_slice(&mut self, src: &[T]) {
debug_assert!(self.len() + src.len() + 1 <= self.cap());
let head_room = self.cap() - self.head;
if self.head < self.tail || src.len() <= head_room {
unsafe {
ptr::copy_nonoverlapping(src.as_ptr(), self.ptr().add(self.head), src.len());
}
} else {
let (left, right) = src.split_at(head_room);
unsafe {
ptr::copy_nonoverlapping(left.as_ptr(), self.ptr().add(self.head), left.len());
ptr::copy_nonoverlapping(right.as_ptr(), self.ptr(), right.len());
}
}
self.head = self.wrap_add(self.head, src.len());
}

/// Frobs the head and tail sections around to handle the fact that we
/// just reallocated. Unsafe because it trusts old_capacity.
#[inline]
Expand Down Expand Up @@ -2088,8 +2108,14 @@ impl<T, A: Allocator> VecDeque<T, A> {
#[inline]
#[stable(feature = "append", since = "1.4.0")]
pub fn append(&mut self, other: &mut Self) {
// naive impl
self.extend(other.drain(..));
self.reserve(other.len());
unsafe {
let (left, right) = other.as_slices();
self.append_slice(left);
self.append_slice(right);
}
// Silently drop values in `other`.
other.tail = other.head;
}

/// Retains only the elements specified by the predicate.
Expand Down

0 comments on commit a456a55

Please sign in to comment.