diff options
| author | The 8472 <git@infinite-source.de> | 2023-06-15 21:14:40 +0200 |
|---|---|---|
| committer | The 8472 <git@infinite-source.de> | 2023-06-15 21:14:40 +0200 |
| commit | 64ee0f74eb4d724e87601fea4bd6b18377289fa2 (patch) | |
| tree | 827964df2ac7a3b7779389fdb72349243b733533 /library/alloc/src/vec | |
| parent | f9097f87c9c094f80826fb60a1a624b5f9f1ed82 (diff) | |
| download | rust-64ee0f74eb4d724e87601fea4bd6b18377289fa2.tar.gz rust-64ee0f74eb4d724e87601fea4bd6b18377289fa2.zip | |
remove unused field
since DrainFilter no longer continues draining when it's dropped the panic tracking is no longer needed.
Diffstat (limited to 'library/alloc/src/vec')
| -rw-r--r-- | library/alloc/src/vec/extract_if.rs | 8 | ||||
| -rw-r--r-- | library/alloc/src/vec/mod.rs | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/library/alloc/src/vec/extract_if.rs b/library/alloc/src/vec/extract_if.rs index e8e6bd56d21..118cfdb36b9 100644 --- a/library/alloc/src/vec/extract_if.rs +++ b/library/alloc/src/vec/extract_if.rs @@ -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. diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs index 289bbc7d2ef..259c659c7eb 100644 --- a/library/alloc/src/vec/mod.rs +++ b/library/alloc/src/vec/mod.rs @@ -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 } } } |
