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

Remove unnecessary lamda on emitter map.
Dylan-DPC-zz · Oct 8, 2020 · 516212e · 516212e
2 parents 45a34fc + dd60ab3
commit 516212e
Showing 1 changed file with 1 addition and 2 deletions.
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(()),