mirror of
https://github.com/rust-embedded/heapless.git
synced 2025-10-02 14:54:30 +00:00
Vec: add retain
, retain_mut
.
This commit is contained in:
parent
f32d5d9daa
commit
2d953ef95a
156
src/vec.rs
156
src/vec.rs
@ -667,6 +667,162 @@ impl<T, const N: usize> Vec<T, N> {
|
|||||||
ret
|
ret
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Retains only the elements specified by the predicate.
|
||||||
|
///
|
||||||
|
/// In other words, remove all elements `e` for which `f(&e)` returns `false`.
|
||||||
|
/// This method operates in place, visiting each element exactly once in the
|
||||||
|
/// original order, and preserves the order of the retained elements.
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// use heapless::Vec;
|
||||||
|
///
|
||||||
|
/// let mut vec: Vec<_, 8> = Vec::from_slice(&[1, 2, 3, 4]).unwrap();
|
||||||
|
/// vec.retain(|&x| x % 2 == 0);
|
||||||
|
/// assert_eq!(vec, [2, 4]);
|
||||||
|
/// ```
|
||||||
|
///
|
||||||
|
/// Because the elements are visited exactly once in the original order,
|
||||||
|
/// external state may be used to decide which elements to keep.
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// use heapless::Vec;
|
||||||
|
///
|
||||||
|
/// let mut vec: Vec<_, 8> = Vec::from_slice(&[1, 2, 3, 4, 5]).unwrap();
|
||||||
|
/// let keep = [false, true, true, false, true];
|
||||||
|
/// let mut iter = keep.iter();
|
||||||
|
/// vec.retain(|_| *iter.next().unwrap());
|
||||||
|
/// assert_eq!(vec, [2, 3, 5]);
|
||||||
|
/// ```
|
||||||
|
pub fn retain<F>(&mut self, mut f: F)
|
||||||
|
where
|
||||||
|
F: FnMut(&T) -> bool,
|
||||||
|
{
|
||||||
|
self.retain_mut(|elem| f(elem));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Retains only the elements specified by the predicate, passing a mutable reference to it.
|
||||||
|
///
|
||||||
|
/// In other words, remove all elements `e` such that `f(&mut e)` returns `false`.
|
||||||
|
/// This method operates in place, visiting each element exactly once in the
|
||||||
|
/// original order, and preserves the order of the retained elements.
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// use heapless::Vec;
|
||||||
|
///
|
||||||
|
/// let mut vec: Vec<_, 8> = Vec::from_slice(&[1, 2, 3, 4]).unwrap();
|
||||||
|
/// vec.retain_mut(|x| if *x <= 3 {
|
||||||
|
/// *x += 1;
|
||||||
|
/// true
|
||||||
|
/// } else {
|
||||||
|
/// false
|
||||||
|
/// });
|
||||||
|
/// assert_eq!(vec, [2, 3, 4]);
|
||||||
|
/// ```
|
||||||
|
pub fn retain_mut<F>(&mut self, mut f: F)
|
||||||
|
where
|
||||||
|
F: FnMut(&mut T) -> bool,
|
||||||
|
{
|
||||||
|
let original_len = self.len();
|
||||||
|
// Avoid double drop if the drop guard is not executed,
|
||||||
|
// since we may make some holes during the process.
|
||||||
|
unsafe { self.set_len(0) };
|
||||||
|
|
||||||
|
// Vec: [Kept, Kept, Hole, Hole, Hole, Hole, Unchecked, Unchecked]
|
||||||
|
// |<- processed len ->| ^- next to check
|
||||||
|
// |<- deleted cnt ->|
|
||||||
|
// |<- original_len ->|
|
||||||
|
// Kept: Elements which predicate returns true on.
|
||||||
|
// Hole: Moved or dropped element slot.
|
||||||
|
// Unchecked: Unchecked valid elements.
|
||||||
|
//
|
||||||
|
// This drop guard will be invoked when predicate or `drop` of element panicked.
|
||||||
|
// It shifts unchecked elements to cover holes and `set_len` to the correct length.
|
||||||
|
// In cases when predicate and `drop` never panick, it will be optimized out.
|
||||||
|
struct BackshiftOnDrop<'a, T, const N: usize> {
|
||||||
|
v: &'a mut Vec<T, N>,
|
||||||
|
processed_len: usize,
|
||||||
|
deleted_cnt: usize,
|
||||||
|
original_len: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T, const N: usize> Drop for BackshiftOnDrop<'_, T, N> {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
if self.deleted_cnt > 0 {
|
||||||
|
// SAFETY: Trailing unchecked items must be valid since we never touch them.
|
||||||
|
unsafe {
|
||||||
|
ptr::copy(
|
||||||
|
self.v.as_ptr().add(self.processed_len),
|
||||||
|
self.v
|
||||||
|
.as_mut_ptr()
|
||||||
|
.add(self.processed_len - self.deleted_cnt),
|
||||||
|
self.original_len - self.processed_len,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// SAFETY: After filling holes, all items are in contiguous memory.
|
||||||
|
unsafe {
|
||||||
|
self.v.set_len(self.original_len - self.deleted_cnt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut g = BackshiftOnDrop {
|
||||||
|
v: self,
|
||||||
|
processed_len: 0,
|
||||||
|
deleted_cnt: 0,
|
||||||
|
original_len,
|
||||||
|
};
|
||||||
|
|
||||||
|
fn process_loop<F, T, const N: usize, const DELETED: bool>(
|
||||||
|
original_len: usize,
|
||||||
|
f: &mut F,
|
||||||
|
g: &mut BackshiftOnDrop<'_, T, N>,
|
||||||
|
) where
|
||||||
|
F: FnMut(&mut T) -> bool,
|
||||||
|
{
|
||||||
|
while g.processed_len != original_len {
|
||||||
|
let p = g.v.as_mut_ptr();
|
||||||
|
// SAFETY: Unchecked element must be valid.
|
||||||
|
let cur = unsafe { &mut *p.add(g.processed_len) };
|
||||||
|
if !f(cur) {
|
||||||
|
// Advance early to avoid double drop if `drop_in_place` panicked.
|
||||||
|
g.processed_len += 1;
|
||||||
|
g.deleted_cnt += 1;
|
||||||
|
// SAFETY: We never touch this element again after dropped.
|
||||||
|
unsafe { ptr::drop_in_place(cur) };
|
||||||
|
// We already advanced the counter.
|
||||||
|
if DELETED {
|
||||||
|
continue;
|
||||||
|
} else {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if DELETED {
|
||||||
|
// SAFETY: `deleted_cnt` > 0, so the hole slot must not overlap with current element.
|
||||||
|
// We use copy for move, and never touch this element again.
|
||||||
|
unsafe {
|
||||||
|
let hole_slot = p.add(g.processed_len - g.deleted_cnt);
|
||||||
|
ptr::copy_nonoverlapping(cur, hole_slot, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
g.processed_len += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stage 1: Nothing was deleted.
|
||||||
|
process_loop::<F, T, N, false>(original_len, &mut f, &mut g);
|
||||||
|
|
||||||
|
// Stage 2: Some elements were deleted.
|
||||||
|
process_loop::<F, T, N, true>(original_len, &mut f, &mut g);
|
||||||
|
|
||||||
|
// All item are processed. This can be optimized to `set_len` by LLVM.
|
||||||
|
drop(g);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Trait implementations
|
// Trait implementations
|
||||||
|
Loading…
x
Reference in New Issue
Block a user