bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #112677 - the8472:remove-unusued-field, r=JohnTitor

Browse source 
remove unused field

Followup to #104455. The field is no longer needed since ExtractIf (previously DrainFilter) doesn't keep draining in its drop impl.
This commit is contained in:
Takayuki Maeda 2023-06-26 23:16:16 +09:00 • committed by GitHub
commit c6a4d44977
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
library/alloc/src/vec/extract_if.rs
View file

@ -37,12 +37,6 @@ pub struct ExtractIf<
pub(super) old_len: usize,
/// The filter test predicate.
pub(super) pred: F,
/// A flag that indicates a panic has occurred in the filter test predicate.
/// This is used as a hint in the drop implementation to prevent consumption
/// of the remainder of the `ExtractIf`. Any unprocessed items will be
/// backshifted in the `vec`, but no further items will be dropped or
/// tested by the filter predicate.
pub(super) panic_flag: bool,
}
impl<T, F, A: Allocator> ExtractIf<'_, T, F, A>
@ -69,9 +63,7 @@ where
while self.idx < self.old_len {
let i = self.idx;
let v = slice::from_raw_parts_mut(self.vec.as_mut_ptr(), self.old_len);
self.panic_flag = true;
let drained = (self.pred)(&mut v[i]);
self.panic_flag = false;
// Update the index *after* the predicate is called. If the index
// is updated prior and the predicate panics, the element at this
// index would be leaked.

2
library/alloc/src/vec/mod.rs
View file

@ -2948,7 +2948,7 @@ impl<T, A: Allocator> Vec<T, A> {
self.set_len(0);
}
ExtractIf { vec: self, idx: 0, del: 0, old_len, pred: filter, panic_flag: false }
ExtractIf { vec: self, idx: 0, del: 0, old_len, pred: filter }
}
}