Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 3 additions & 7 deletions src/adaptors/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -405,13 +405,9 @@ where
let elt_b = match b.next() {
None => {
*b = b_orig.clone();
match b.next() {
None => return None,
Some(x) => {
*a_cur = Some(a.next());
x
}
}
let x = b.next()?;
*a_cur = Some(a.next());
x
}
Some(x) => x,
};
Expand Down
10 changes: 2 additions & 8 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2899,10 +2899,7 @@ pub trait Itertools: Iterator {
F: FnMut(B, A) -> B,
{
for elt in self {
match elt {
Ok(v) => start = f(start, v),
Err(u) => return Err(u),
}
start = f(start, elt?)
}
Ok(start)
}
Expand Down Expand Up @@ -2932,10 +2929,7 @@ pub trait Itertools: Iterator {
F: FnMut(B, A) -> B,
{
for elt in self {
match elt {
Some(v) => start = f(start, v),
None => return None,
}
start = f(start, elt?)
}
Some(start)
}
Expand Down
10 changes: 3 additions & 7 deletions src/multipeek_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,9 @@ impl<I: Iterator> MultiPeek<I> {
let ret = if self.index < self.buf.len() {
Some(&self.buf[self.index])
} else {
match self.iter.next() {
Some(x) => {
self.buf.push_back(x);
Some(&self.buf[self.index])
}
None => return None,
}
let x = self.iter.next()?;
self.buf.push_back(x);
Some(&self.buf[self.index])
};

self.index += 1;
Expand Down
Loading