From 997b172e0ebda51d5d15c6f2397d66ff0f3110db Mon Sep 17 00:00:00 2001 From: Ronno Das Date: Sat, 5 Sep 2026 07:53:51 +0530 Subject: [PATCH] Fix `clippy::question_mark` warnings --- src/adaptors/mod.rs | 10 +++------- src/lib.rs | 10 ++-------- src/multipeek_impl.rs | 10 +++------- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/adaptors/mod.rs b/src/adaptors/mod.rs index b5c0d42b1..c6875a00e 100644 --- a/src/adaptors/mod.rs +++ b/src/adaptors/mod.rs @@ -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, }; diff --git a/src/lib.rs b/src/lib.rs index 57848ff7c..4d1527637 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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) } @@ -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) } diff --git a/src/multipeek_impl.rs b/src/multipeek_impl.rs index 6f800b6fb..cb679383d 100644 --- a/src/multipeek_impl.rs +++ b/src/multipeek_impl.rs @@ -51,13 +51,9 @@ impl MultiPeek { 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;