bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't drop values in other, just move the tail

Browse source
This commit is contained in:
Pazzaz 2018-08-14 20:54:25 +02:00
parent 894c9ca1a7
commit 8d3554c48d
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/liballoc/collections/vec_deque.rs
View file

@ -1859,7 +1859,7 @@ impl<T> VecDeque<T> {
// Guarantees there is space in `self` for `other`.
self.reserve(src_total);
let new_head = {
self.head = {
let original_head = self.head;
// The goal is to copy all values from `other` into `self`. To avoid any
@ -1988,12 +1988,8 @@ impl<T> VecDeque<T> {
}
};
// Up until this point we are in a bad state as some values
// exist in both `self` and `other`. To preserve panic safety
// it is important we clear the old values from `other`...
other.clear();
// and that we update `head` as the last step, making the values accessible in `self`.
self.head = new_head;
// Some values now exist in both `other` and `self` but are made inaccessible in `other`.
other.tail = other.head;
}
/// Retains only the elements specified by the predicate.