diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2023-04-03 18:08:32 +0200 |
---|---|---|
committer | Jeff Vander Stoep <jeffv@google.com> | 2023-04-03 18:08:32 +0200 |
commit | a452597528b57dedcae8a1df13ae9c53a56e5330 (patch) | |
tree | 1900296c4c4cc8dbc1dcc832ee0e0fcbdcceb88b /src/vec.rs | |
parent | e8f5b0c9f5ad0f805638e7d2bf916f3f034abe04 (diff) | |
download | rayon-a452597528b57dedcae8a1df13ae9c53a56e5330.tar.gz |
Upgrade rayon to 1.7.0android-u-beta-1-gpl
This project was upgraded with external_updater.
Usage: tools/external_updater/updater.sh update rust/crates/rayon
For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md
Test: TreeHugger
Change-Id: Id3b0ce117290de8306402351d88eff7a9619d47f
Diffstat (limited to 'src/vec.rs')
-rw-r--r-- | src/vec.rs | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -225,8 +225,9 @@ impl<'data, T: 'data + Send> Producer for DrainProducer<'data, T> { impl<'data, T: 'data + Send> Drop for DrainProducer<'data, T> { fn drop(&mut self) { - // use `Drop for [T]` - unsafe { ptr::drop_in_place(self.slice) }; + // extract the slice so we can use `Drop for [T]` + let slice_ptr: *mut [T] = mem::take::<&'data mut [T]>(&mut self.slice); + unsafe { ptr::drop_in_place::<[T]>(slice_ptr) }; } } @@ -276,7 +277,7 @@ impl<'data, T: 'data> iter::FusedIterator for SliceDrain<'data, T> {} impl<'data, T: 'data> Drop for SliceDrain<'data, T> { fn drop(&mut self) { // extract the iterator so we can use `Drop for [T]` - let iter = mem::replace(&mut self.iter, [].iter_mut()); - unsafe { ptr::drop_in_place(iter.into_slice()) }; + let slice_ptr: *mut [T] = mem::replace(&mut self.iter, [].iter_mut()).into_slice(); + unsafe { ptr::drop_in_place::<[T]>(slice_ptr) }; } } |