Skip to content

Commit 52c3b56

Browse files
Tuple*Combination::fold: avoid unwrap
1 parent 220e902 commit 52c3b56

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/adaptors/mod.rs

+5-6
Original file line numberDiff line numberDiff line change
@@ -767,12 +767,11 @@ macro_rules! impl_tuple_combination {
767767
F: FnMut(B, Self::Item) -> B,
768768
{
769769
let Self { c, item, mut iter } = self;
770-
init = c
771-
.map(|($($X),*,)| {
772-
let z = item.clone().unwrap();
773-
(z, $($X),*)
774-
})
775-
.fold(init, &mut f);
770+
if let Some(z) = item.as_ref() {
771+
init = c
772+
.map(|($($X),*,)| (z.clone(), $($X),*))
773+
.fold(init, &mut f);
774+
}
776775
while let Some(z) = iter.next() {
777776
let c: $P<I> = iter.clone().into();
778777
init = c

0 commit comments

Comments
 (0)