Tuple*Combination::fold: avoid unwrap

rust-itertools · Oct 27, 2023 · 9154da6 · 9154da6
1 parent 21004ed
commit 9154da6
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/adaptors/mod.rs b/src/adaptors/mod.rs
@@ -767,12 +767,11 @@ macro_rules! impl_tuple_combination {
                 F: FnMut(B, Self::Item) -> B,
             {
                 let Self { c, item, mut iter } = self;
-                init = c
-                    .map(|($($X),*,)| {
-                        let z = item.clone().unwrap();
-                        (z, $($X),*)
-                    })
-                    .fold(init, &mut f);
+                if let Some(z) = item.as_ref() {
+                    init = c
+                        .map(|($($X),*,)| (z.clone(), $($X),*))
+                        .fold(init, &mut f);
+                }
                 while let Some(z) = iter.next() {
                     let c: $P<I> = iter.clone().into();
                     init = c