matthiasbeyer
/
imag
1
0
Fork 0
Code Releases Activity

Simplify `OnErr` iterator `next` and `next_back`

This commit is contained in:
Matthijs Hofstra 2016-10-21 11:02:52 +02:00
parent 174a9b2d40
commit 7a5f5b5061
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libimagerror/src/iter.rs
View File

@ -38,13 +38,7 @@ impl<I, F, T, E> Iterator for OnErr<I, F> where
#[inline]
fn next(&mut self) -> Option<Self::Item> {
match self.iter.next() {
Some(Err(e)) => {
(self.f)(&e);
Some(Err(e))
},
other => other
}
self.iter.next().map(|r| r.map_err(|e| { (self.f)(&e); e }))
}
#[inline]
@ -65,13 +59,7 @@ impl<I, F, T, E> DoubleEndedIterator for OnErr<I, F> where
{
#[inline]
fn next_back(&mut self) -> Option<Self::Item> {
match self.iter.next_back() {
Some(Err(e)) => {
(self.f)(&e);
Some(Err(e))
},
other => other
}
self.iter.next_back().map(|r| r.map_err(|e| { (self.f)(&e); e }))
}
}