diff options
| author | llogiq <bogusandre@gmail.com> | 2015-09-03 12:35:34 +0200 |
|---|---|---|
| committer | llogiq <bogusandre@gmail.com> | 2015-09-03 12:35:34 +0200 |
| commit | b6a397888689a22803bb364f74177e855b64c680 (patch) | |
| tree | 695dbb3010e8f9242e7f1000b6db2e409c704c4b | |
| parent | 1661947014fc2ecbbb7a30b1604499500dcf767e (diff) | |
| download | rust-b6a397888689a22803bb364f74177e855b64c680.tar.gz rust-b6a397888689a22803bb364f74177e855b64c680.zip | |
clippy improvements to iterators
| -rw-r--r-- | src/libcore/iter.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs index 3d17b10ba3a..53b72fe2ba7 100644 --- a/src/libcore/iter.rs +++ b/src/libcore/iter.rs @@ -1513,7 +1513,7 @@ impl<A, B> Iterator for Chain<A, B> where fn next(&mut self) -> Option<A::Item> { match self.state { ChainState::Both => match self.a.next() { - elt @ Some(..) => return elt, + elt @ Some(..) => elt, None => { self.state = ChainState::Back; self.b.next() @@ -1590,7 +1590,7 @@ impl<A, B> DoubleEndedIterator for Chain<A, B> where fn next_back(&mut self) -> Option<A::Item> { match self.state { ChainState::Both => match self.b.next_back() { - elt @ Some(..) => return elt, + elt @ Some(..) => elt, None => { self.state = ChainState::Front; self.a.next_back() @@ -1683,7 +1683,7 @@ impl<B, I: Iterator, F> Iterator for Map<I, F> where F: FnMut(I::Item) -> B { #[inline] fn next(&mut self) -> Option<B> { - self.iter.next().map(|a| (self.f)(a)) + self.iter.next().map(self.f) } #[inline] @@ -1698,7 +1698,7 @@ impl<B, I: DoubleEndedIterator, F> DoubleEndedIterator for Map<I, F> where { #[inline] fn next_back(&mut self) -> Option<B> { - self.iter.next_back().map(|a| (self.f)(a)) + self.iter.next_back().map(self.f) } } @@ -2210,7 +2210,7 @@ impl<I: Iterator, U: IntoIterator, F> Iterator for FlatMap<I, U, F> return Some(x) } } - match self.iter.next().map(|x| (self.f)(x)) { + match self.iter.next().map(self.f) { None => return self.backiter.as_mut().and_then(|it| it.next()), next => self.frontiter = next.map(IntoIterator::into_iter), } @@ -2243,7 +2243,7 @@ impl<I: DoubleEndedIterator, U, F> DoubleEndedIterator for FlatMap<I, U, F> wher return Some(y) } } - match self.iter.next_back().map(|x| (self.f)(x)) { + match self.iter.next_back().map(self.f) { None => return self.frontiter.as_mut().and_then(|it| it.next_back()), next => self.backiter = next.map(IntoIterator::into_iter), } |
