1 files changed, 27 insertions, 38 deletions
diff --git a/src/librustc_codegen_llvm/llvm/diagnostic.rs b/src/librustc_codegen_llvm/llvm/diagnostic.rs
index 04e65ac4233..4347cd06532 100644
--- a/src/librustc_codegen_llvm/llvm/diagnostic.rs
+++ b/src/librustc_codegen_llvm/llvm/diagnostic.rs
@@ -1,10 +1,10 @@
 //! LLVM diagnostic reports.
 
-pub use self::OptimizationDiagnosticKind::*;
 pub use self::Diagnostic::*;
+pub use self::OptimizationDiagnosticKind::*;
 
-use libc::c_uint;
 use crate::value::Value;
+use libc::c_uint;
 
 use super::{DiagnosticInfo, Twine};
 
@@ -43,29 +43,31 @@ pub struct OptimizationDiagnostic<'ll> {
 }
 
 impl OptimizationDiagnostic<'ll> {
-    unsafe fn unpack(
-        kind: OptimizationDiagnosticKind,
-        di: &'ll DiagnosticInfo,
-    ) -> Self {
+    unsafe fn unpack(kind: OptimizationDiagnosticKind, di: &'ll DiagnosticInfo) -> Self {
         let mut function = None;
         let mut line = 0;
         let mut column = 0;
 
         let mut message = None;
         let mut filename = None;
-        let pass_name = super::build_string(|pass_name|
-            message = super::build_string(|message|
-                filename = super::build_string(|filename|
-                    super::LLVMRustUnpackOptimizationDiagnostic(di,
-                                                                pass_name,
-                                                                &mut function,
-                                                                &mut line,
-                                                                &mut column,
-                                                                filename,
-                                                                message)
-                ).ok()
-            ).ok()
-        ).ok();
+        let pass_name = super::build_string(|pass_name| {
+            message = super::build_string(|message| {
+                filename = super::build_string(|filename| {
+                    super::LLVMRustUnpackOptimizationDiagnostic(
+                        di,
+                        pass_name,
+                        &mut function,
+                        &mut line,
+                        &mut column,
+                        filename,
+                        message,
+                    )
+                })
+                .ok()
+            })
+            .ok()
+        })
+        .ok();
 
         let mut filename = filename.unwrap_or_default();
         if filename.is_empty() {
@@ -79,7 +81,7 @@ impl OptimizationDiagnostic<'ll> {
             line,
             column,
             filename,
-            message: message.expect("got a non-UTF8 OptimizationDiagnostic message from LLVM")
+            message: message.expect("got a non-UTF8 OptimizationDiagnostic message from LLVM"),
         }
     }
 }
@@ -97,18 +99,9 @@ impl InlineAsmDiagnostic<'ll> {
         let mut message = None;
         let mut instruction = None;
 
-        super::LLVMRustUnpackInlineAsmDiagnostic(
-            di,
-            &mut cookie,
-            &mut message,
-            &mut instruction,
-        );
-
-        InlineAsmDiagnostic {
-            cookie,
-            message: message.unwrap(),
-            instruction,
-        }
+        super::LLVMRustUnpackInlineAsmDiagnostic(di, &mut cookie, &mut message, &mut instruction);
+
+        InlineAsmDiagnostic { cookie, message: message.unwrap(), instruction }
     }
 }
 
@@ -156,12 +149,8 @@ impl Diagnostic<'ll> {
                 Optimization(OptimizationDiagnostic::unpack(OptimizationFailure, di))
             }
 
-            Dk::PGOProfile => {
-                PGO(di)
-            }
-            Dk::Linker => {
-                Linker(di)
-            }
+            Dk::PGOProfile => PGO(di),
+            Dk::Linker => Linker(di),
 
             _ => UnknownDiagnostic(di),
         }