Skip to content

Commit c3ac8d8

Browse files
committed
replace Option combinators with try block
1 parent 8dd903c commit c3ac8d8

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

library/core/src/iter/adapters/flatten.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -319,12 +319,8 @@ where
319319
let (lower, upper) = self.iter.size_hint();
320320

321321
let lower = lower.saturating_mul(fixed_size).saturating_add(lo);
322-
let upper = upper.and_then(|i| i.checked_mul(fixed_size));
323-
let upper = fhi
324-
.zip_with(bhi, usize::checked_add)
325-
.flatten()
326-
.zip_with(upper, usize::checked_add)
327-
.flatten();
322+
let upper =
323+
try { fhi?.checked_add(bhi?)?.checked_add(fixed_size.checked_mul(upper?)?)? };
328324

329325
return (lower, upper);
330326
}

0 commit comments

Comments
 (0)