From c3ac8d8b8683fdb7f247e9107397ec8948ad4568 Mon Sep 17 00:00:00 2001 From: The8472 Date: Mon, 19 Jul 2021 20:21:54 +0200 Subject: [PATCH] replace Option combinators with try block --- library/core/src/iter/adapters/flatten.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/library/core/src/iter/adapters/flatten.rs b/library/core/src/iter/adapters/flatten.rs index 9e0f6d2905d..48880a4d91a 100644 --- a/library/core/src/iter/adapters/flatten.rs +++ b/library/core/src/iter/adapters/flatten.rs @@ -319,12 +319,8 @@ where let (lower, upper) = self.iter.size_hint(); let lower = lower.saturating_mul(fixed_size).saturating_add(lo); - let upper = upper.and_then(|i| i.checked_mul(fixed_size)); - let upper = fhi - .zip_with(bhi, usize::checked_add) - .flatten() - .zip_with(upper, usize::checked_add) - .flatten(); + let upper = + try { fhi?.checked_add(bhi?)?.checked_add(fixed_size.checked_mul(upper?)?)? }; return (lower, upper); }