Skip to content

Commit

Permalink
Switch to retain calling drain_filter.
Browse files Browse the repository at this point in the history
  • Loading branch information
Xaeroxe authored Feb 13, 2018
1 parent a67749a commit fbad3b2
Showing 1 changed file with 1 addition and 21 deletions.
22 changes: 1 addition & 21 deletions src/liballoc/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -805,27 +805,7 @@ impl<T> Vec<T> {
pub fn retain<F>(&mut self, mut f: F)
where F: FnMut(&T) -> bool
{
let len = self.len();
let mut del = 0;
{
let v = &mut **self;

for i in 0..len {
if !f(&v[i]) {
del += 1;
unsafe {
ptr::drop_in_place(&mut v[i]);
}
} else if del > 0 {
let src: *const T = &v[i];
let dst: *mut T = &mut v[i - del];
unsafe {
ptr::copy_nonoverlapping(src, dst, 1);
}
}
}
}
self.len = len - del;
self.drain_filter(|x| !f(x));
}

/// Removes all but the first of consecutive elements in the vector that resolve to the same
Expand Down

0 comments on commit fbad3b2

Please sign in to comment.