Rollup merge of rust-lang#93116 - rust-lang:oli-obk-patch-1, r=jackh726

Simplify use of `map_or`
matthiaskrgr · Jan 22, 2022 · 287d439 · 287d439
2 parents 3c37d63 + 8d0d023
commit 287d439
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/compiler/rustc_mir_transform/src/coverage/graph.rs b/compiler/rustc_mir_transform/src/coverage/graph.rs
@@ -418,7 +418,7 @@ impl BasicCoverageBlockData {
     pub fn take_edge_counters(
         &mut self,
     ) -> Option<impl Iterator<Item = (BasicCoverageBlock, CoverageKind)>> {
-        self.edge_from_bcbs.take().map_or(None, |m| Some(m.into_iter()))
+        self.edge_from_bcbs.take().map(|m| m.into_iter())
     }
 
     pub fn id(&self) -> String {