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

matthiaskrgr · web-flow · commit 2ecbc4b49d86 · 2022-01-22T15:32:51.000+01:00
Simplify use of `map_or`
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 {

Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,7 @@ impl BasicCoverageBlockData {`
`418`	`418`	`pub fn take_edge_counters(`
`419`	`419`	`&mut self,`
`420`	`420`	`) -> Option<impl Iterator<Item = (BasicCoverageBlock, CoverageKind)>> {`
`421`		`- self.edge_from_bcbs.take().map_or(None, \|m\| Some(m.into_iter()))`
	`421`	`+ self.edge_from_bcbs.take().map(\|m\| m.into_iter())`
`422`	`422`	`}`
`423`	`423`
`424`	`424`	`pub fn id(&self) -> String {`