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
@@ -188,10 +188,7 @@ impl<'a> Validators<'a> {
finalized_blocks: &[(HeaderId, Option<S::Submitter>)],
) -> Option<ChangeToEnact> {
// if we haven't finalized any blocks, no changes may be finalized
let newest_finalized_id = match finalized_blocks.last().map(|(id, _)| id) {
Some(last_finalized_id) => last_finalized_id,
None => return None,
};
let newest_finalized_id = finalized_blocks.last().map(|(id, _)| id)?;
let oldest_finalized_id = finalized_blocks
.first()
.map(|(id, _)| id)