Skip to content

Commit

Permalink
Unrolled build for rust-lang#135956
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#135956 - GrigorenkoPV:vec_pop_off, r=dtolnay

Make `Vec::pop_if` a bit more presentable

rust-lang#135488 minus stabilization.

As suggested in rust-lang#135488 (comment).

r? tgross35
  • Loading branch information
rust-timer authored Jan 24, 2025
2 parents 8231e85 + b2ad126 commit ca82e91
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions library/alloc/src/vec/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2511,9 +2511,9 @@ impl<T, A: Allocator> Vec<T, A> {
}
}

/// Removes and returns the last element in a vector if the predicate
/// Removes and returns the last element from a vector if the predicate
/// returns `true`, or [`None`] if the predicate returns false or the vector
/// is empty.
/// is empty (the predicate will not be called in that case).
///
/// # Examples
///
Expand All @@ -2528,12 +2528,9 @@ impl<T, A: Allocator> Vec<T, A> {
/// assert_eq!(vec.pop_if(pred), None);
/// ```
#[unstable(feature = "vec_pop_if", issue = "122741")]
pub fn pop_if<F>(&mut self, f: F) -> Option<T>
where
F: FnOnce(&mut T) -> bool,
{
pub fn pop_if(&mut self, predicate: impl FnOnce(&mut T) -> bool) -> Option<T> {
let last = self.last_mut()?;
if f(last) { self.pop() } else { None }
if predicate(last) { self.pop() } else { None }
}

/// Moves all the elements of `other` into `self`, leaving `other` empty.
Expand Down

0 comments on commit ca82e91

Please sign in to comment.