diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-12-13 20:35:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-13 20:35:30 +0100 |
| commit | 48164f8a17501e7386afa4a371432168e598fcb5 (patch) | |
| tree | 364a32874b20b34dc04227e02488bedc7555e247 /src/liballoc/collections | |
| parent | df9e491fb238ff7b7bfee8dd2d3f01158ac8b0d3 (diff) | |
| parent | 82c09b75d7fef78db2d485793cfa8bf5583ff7cf (diff) | |
| download | rust-48164f8a17501e7386afa4a371432168e598fcb5.tar.gz rust-48164f8a17501e7386afa4a371432168e598fcb5.zip | |
Rollup merge of #67235 - jonas-schievink:vecdeque-leak, r=KodrAus
VecDeque: drop remaining items on destructor panic Closes https://github.com/rust-lang/rust/issues/67232
Diffstat (limited to 'src/liballoc/collections')
| -rw-r--r-- | src/liballoc/collections/vec_deque.rs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/liballoc/collections/vec_deque.rs b/src/liballoc/collections/vec_deque.rs index ebd3f010077..913613653a6 100644 --- a/src/liballoc/collections/vec_deque.rs +++ b/src/liballoc/collections/vec_deque.rs @@ -144,11 +144,23 @@ impl<T: Clone> Clone for VecDeque<T> { #[stable(feature = "rust1", since = "1.0.0")] unsafe impl<#[may_dangle] T> Drop for VecDeque<T> { fn drop(&mut self) { + /// Runs the destructor for all items in the slice when it gets dropped (normally or + /// during unwinding). + struct Dropper<'a, T>(&'a mut [T]); + + impl<'a, T> Drop for Dropper<'a, T> { + fn drop(&mut self) { + unsafe { + ptr::drop_in_place(self.0); + } + } + } + let (front, back) = self.as_mut_slices(); unsafe { + let _back_dropper = Dropper(back); // use drop for [T] ptr::drop_in_place(front); - ptr::drop_in_place(back); } // RawVec handles deallocation } |
