Rollup merge of #77673 - heckad:patch-2, r=lcnr

jonas-schievink · web-flow · commit 48c1ca15bb39 · 2020-10-08T23:23:13.000+02:00
Remove unnecessary lamda on emitter map.
diff --git a/compiler/rustc_driver/src/lib.rs b/compiler/rustc_driver/src/lib.rs
@@ -155,8 +155,7 @@ pub fn run_compiler(
             ),
         }
     }
-    let diagnostic_output =
-        emitter.map(|emitter| DiagnosticOutput::Raw(emitter)).unwrap_or(DiagnosticOutput::Default);
+    let diagnostic_output = emitter.map_or(DiagnosticOutput::Default, DiagnosticOutput::Raw);
     let matches = match handle_options(&args) {
         Some(matches) => matches,
         None => return Ok(()),

Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,7 @@ pub fn run_compiler(`
`155`	`155`	`),`
`156`	`156`	`}`
`157`	`157`	`}`
`158`		`- let diagnostic_output =`
`159`		`- emitter.map(\|emitter\| DiagnosticOutput::Raw(emitter)).unwrap_or(DiagnosticOutput::Default);`
	`158`	`+ let diagnostic_output = emitter.map_or(DiagnosticOutput::Default, DiagnosticOutput::Raw);`
`160`	`159`	`let matches = match handle_options(&args) {`
`161`	`160`	`Some(matches) => matches,`
`162`	`161`	`None => return Ok(()),`