itsscb/heapless
1
0
Fork 0
mirror of https://github.com/rust-embedded/heapless.git synced 2025-10-02 06:50:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hole: switch from Option to ManuallyDrop to avoid a panicking branch

Browse Source
This commit is contained in:
Jorge Aparicio 2018-04-28 07:18:47 +02:00
parent 08c76f34c7
commit 8121700a76
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/binary_heap.rs
View File

@ -10,6 +10,7 @@
use core::cmp::Ordering;
use core::marker::PhantomData;
use core::mem::ManuallyDrop;
use core::{mem, ptr, slice};
use generic_array::ArrayLength;
@ -333,7 +334,7 @@ where
struct Hole<'a, T: 'a> {
data: &'a mut [T],
/// `elt` is always `Some` from new until drop.
elt: Option<T>,
elt: ManuallyDrop<T>,
pos: usize,
}
@ -347,7 +348,7 @@ impl<'a, T> Hole<'a, T> {
let elt = ptr::read(data.get_unchecked(pos));
Hole {
data,
elt: Some(elt),
elt: ManuallyDrop::new(elt),
pos,
}
}
@ -360,7 +361,7 @@ impl<'a, T> Hole<'a, T> {
/// Returns a reference to the element removed.
#[inline]
fn element(&self) -> &T {
self.elt.as_ref().unwrap()
&self.elt
}
/// Returns a reference to the element at `index`.
@ -393,7 +394,7 @@ impl<'a, T> Drop for Hole<'a, T> {
// fill the hole again
unsafe {
let pos = self.pos;
ptr::write(self.data.get_unchecked_mut(pos), self.elt.take().unwrap());
ptr::write(self.data.get_unchecked_mut(pos), ptr::read(&*self.elt));
}
}
}