From 3ada070db26b37f5f9bec96dd42a301a471d0f1a Mon Sep 17 00:00:00 2001 From: philipp Date: Wed, 6 May 2020 19:45:49 +0200 Subject: [PATCH 1/2] Prefer pop_front over explicit is_empty --- src/multipeek_impl.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/multipeek_impl.rs b/src/multipeek_impl.rs index 0b64e1d7a..99ee3953e 100644 --- a/src/multipeek_impl.rs +++ b/src/multipeek_impl.rs @@ -82,11 +82,7 @@ impl Iterator for MultiPeek fn next(&mut self) -> Option { self.index = 0; - if self.buf.is_empty() { - self.iter.next() - } else { - self.buf.pop_front() - } + self.buf.pop_front().or_else(|| self.iter.next()) } fn size_hint(&self) -> (usize, Option) { From 7baf163cf50cd500fed4cb606c2ae548cca94eff Mon Sep 17 00:00:00 2001 From: philipp Date: Wed, 6 May 2020 19:45:49 +0200 Subject: [PATCH 2/2] Prefer pop over explicit is_empty --- src/put_back_n_impl.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/put_back_n_impl.rs b/src/put_back_n_impl.rs index dcb28946e..348c1d00e 100644 --- a/src/put_back_n_impl.rs +++ b/src/put_back_n_impl.rs @@ -48,11 +48,7 @@ impl Iterator for PutBackN { type Item = I::Item; #[inline] fn next(&mut self) -> Option { - if self.top.is_empty() { - self.iter.next() - } else { - self.top.pop() - } + self.top.pop().or_else(|| self.iter.next()) } #[inline]