bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use ptr::drop_in_place in Vec::truncate

Browse source
This commit is contained in:
Ulrik Sverdrup 2016-03-02 17:48:50 +01:00
parent c0f8b08594
commit 1da364e98f
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libcollections/vec.rs
View file

@ -497,10 +497,11 @@ impl<T> Vec<T> {
unsafe { unsafe {
// drop any extra elements // drop any extra elements
while len < self.len { while len < self.len {
// decrement len before the read(), so a panic on Drop doesn't // decrement len before the drop_in_place(), so a panic on Drop
// re-drop the just-failed value. // doesn't re-drop the just-failed value.
self.len -= 1; self.len -= 1;
ptr::read(self.get_unchecked(self.len)); let len = self.len;
ptr::drop_in_place(self.get_unchecked_mut(len));
} }
} }
} }