Skip to content

Refactored while_some (libstd/option.rs) #12871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Refactored while_some (libstd/option.rs) #12871

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/libstd/option.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,13 @@ impl<T> Option<T> {

/// Applies a function zero or more times until the result is `None`.
#[inline]
pub fn while_some(self, blk: |v: T| -> Option<T>) {
pub fn while_some(self, f: |v: T| -> Option<T>) {
let mut opt = self;
while opt.is_some() {
opt = blk(opt.unwrap());
loop {
match opt {
Some(x) => opt = f(x),
None => break
}
}
}

Expand Down