Simplify some Option / Result / ? operator patterns (#2920)

* Simplify some Option / Result / ? operator patterns

When they identically match a combinator on those types.

Tool-aided by [comby-rust](https://github.com/huitseeker/comby-rust).

* adjust review comments

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
This commit is contained in:
François Garillot
2021-04-25 16:51:01 -04:00
committed by GitHub
parent c7ee98ab5f
commit d4ddf8d7e8
6 changed files with 6 additions and 22 deletions
@@ -317,10 +317,7 @@ pub fn tranches_to_approve(
tranches_with_gaps_filled
.scan(Some(initial_state), |state, (tranche, assignments)| {
// The `Option` here is used for early exit.
let s = match state.take() {
None => return None,
Some(s) => s,
};
let s = state.take()?;
let clock_drift = s.clock_drift(no_show_duration);
let drifted_tick_now = tick_now.saturating_sub(clock_drift);