Rollup merge of #68515 - Wind-River:master_2020, r=alexcrichton

[rust.git] / src / librustc_codegen_ssa / mono_item.rs

diff --git a/src/librustc_codegen_ssa/mono_item.rs b/src/librustc_codegen_ssa/mono_item.rs
index 10177d2997a76ffbd81a82e27cad229ced5d11d5..ae211cad62de4c9f200442ca22a6583c9f349c39 100644 (file)
--- a/src/librustc_codegen_ssa/mono_item.rs
+++ b/src/librustc_codegen_ssa/mono_item.rs
@@ -1,8 +1,8 @@
-use rustc::hir;
-use rustc::mir::mono::{Linkage, Visibility};
-use rustc::ty::layout::HasTyCtxt;
 use crate::base;
 use crate::traits::*;
+use rustc::mir::mono::{Linkage, Visibility};
+use rustc::ty::layout::HasTyCtxt;
+use rustc_hir as hir;
 
 use rustc::mir::mono::MonoItem;
 
@@ -12,17 +12,19 @@ fn predefine<Bx: BuilderMethods<'a, 'tcx>>(
         &self,
         cx: &'a Bx::CodegenCx,
         linkage: Linkage,
-        visibility: Visibility
+        visibility: Visibility,
     );
     fn to_raw_string(&self) -> String;
 }
 
 impl<'a, 'tcx: 'a> MonoItemExt<'a, 'tcx> for MonoItem<'tcx> {
     fn define<Bx: BuilderMethods<'a, 'tcx>>(&self, cx: &'a Bx::CodegenCx) {
-        debug!("BEGIN IMPLEMENTING '{} ({})' in cgu {}",
-               self.to_string(cx.tcx(), true),
-               self.to_raw_string(),
-               cx.codegen_unit().name());
+        debug!(
+            "BEGIN IMPLEMENTING '{} ({})' in cgu {}",
+            self.to_string(cx.tcx(), true),
+            self.to_raw_string(),
+            cx.codegen_unit().name()
+        );
 
         match *self {
             MonoItem::Static(def_id) => {
@@ -41,22 +43,26 @@ fn define<Bx: BuilderMethods<'a, 'tcx>>(&self, cx: &'a Bx::CodegenCx) {
             }
         }
 
-        debug!("END IMPLEMENTING '{} ({})' in cgu {}",
-               self.to_string(cx.tcx(), true),
-               self.to_raw_string(),
-               cx.codegen_unit().name());
+        debug!(
+            "END IMPLEMENTING '{} ({})' in cgu {}",
+            self.to_string(cx.tcx(), true),
+            self.to_raw_string(),
+            cx.codegen_unit().name()
+        );
     }
 
     fn predefine<Bx: BuilderMethods<'a, 'tcx>>(
         &self,
         cx: &'a Bx::CodegenCx,
         linkage: Linkage,
-        visibility: Visibility
+        visibility: Visibility,
     ) {
-        debug!("BEGIN PREDEFINING '{} ({})' in cgu {}",
-               self.to_string(cx.tcx(), true),
-               self.to_raw_string(),
-               cx.codegen_unit().name());
+        debug!(
+            "BEGIN PREDEFINING '{} ({})' in cgu {}",
+            self.to_string(cx.tcx(), true),
+            self.to_raw_string(),
+            cx.codegen_unit().name()
+        );
 
         let symbol_name = self.symbol_name(cx.tcx()).name.as_str();
 
@@ -72,25 +78,21 @@ fn predefine<Bx: BuilderMethods<'a, 'tcx>>(
             MonoItem::GlobalAsm(..) => {}
         }
 
-        debug!("END PREDEFINING '{} ({})' in cgu {}",
-               self.to_string(cx.tcx(), true),
-               self.to_raw_string(),
-               cx.codegen_unit().name());
+        debug!(
+            "END PREDEFINING '{} ({})' in cgu {}",
+            self.to_string(cx.tcx(), true),
+            self.to_raw_string(),
+            cx.codegen_unit().name()
+        );
     }
 
     fn to_raw_string(&self) -> String {
         match *self {
             MonoItem::Fn(instance) => {
-                format!("Fn({:?}, {})",
-                        instance.def,
-                        instance.substs.as_ptr() as usize)
-            }
-            MonoItem::Static(id) => {
-                format!("Static({:?})", id)
-            }
-            MonoItem::GlobalAsm(id) => {
-                format!("GlobalAsm({:?})", id)
+                format!("Fn({:?}, {})", instance.def, instance.substs.as_ptr() as usize)
             }
+            MonoItem::Static(id) => format!("Static({:?})", id),
+            MonoItem::GlobalAsm(id) => format!("GlobalAsm({:?})", id),
         }
     }
 }