about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbjorn3 <bjorn3@users.noreply.github.com>2020-12-25 12:48:19 +0100
committerbjorn3 <bjorn3@users.noreply.github.com>2020-12-25 12:48:19 +0100
commitdbee13661efa269cb4cd57bb4c6b99a19732b484 (patch)
tree3c54302d06da4cf99cbc0e2429fbab66851d4910
parent5b32489e7224eea5fc5ebc388732efa10c510fb2 (diff)
downloadrust-dbee13661efa269cb4cd57bb4c6b99a19732b484.tar.gz
rust-dbee13661efa269cb4cd57bb4c6b99a19732b484.zip
Rustfmt
-rw-r--r--src/base.rs8
-rw-r--r--src/constant.rs5
-rw-r--r--src/debuginfo/emit.rs5
-rw-r--r--src/pretty_clif.rs58
4 files changed, 39 insertions, 37 deletions
diff --git a/src/base.rs b/src/base.rs
index 5ba992d9372..34c9561d676 100644
--- a/src/base.rs
+++ b/src/base.rs
@@ -144,9 +144,11 @@ pub(crate) fn codegen_fn<'tcx>(
 
     if let Some(mach_compile_result) = &context.mach_compile_result {
         if let Some(disasm) = &mach_compile_result.disasm {
-            crate::pretty_clif::write_ir_file(tcx, &format!("{}.vcode", tcx.symbol_name(instance).name), |file| {
-                file.write_all(disasm.as_bytes())
-            })
+            crate::pretty_clif::write_ir_file(
+                tcx,
+                &format!("{}.vcode", tcx.symbol_name(instance).name),
+                |file| file.write_all(disasm.as_bytes()),
+            )
         }
     }
 
diff --git a/src/constant.rs b/src/constant.rs
index bfa2076d3d9..beff84fb2e2 100644
--- a/src/constant.rs
+++ b/src/constant.rs
@@ -100,7 +100,10 @@ fn codegen_static_ref<'tcx>(
     let global_ptr = fx.bcx.ins().global_value(fx.pointer_type, local_data_id);
     assert!(!layout.is_unsized(), "unsized statics aren't supported");
     assert!(
-        matches!(fx.bcx.func.global_values[local_data_id], GlobalValueData::Symbol { tls: false, ..}),
+        matches!(
+            fx.bcx.func.global_values[local_data_id],
+            GlobalValueData::Symbol { tls: false, .. }
+        ),
         "tls static referenced without Rvalue::ThreadLocalRef"
     );
     CPlace::for_ptr(crate::pointer::Pointer::new(global_ptr), layout)
diff --git a/src/debuginfo/emit.rs b/src/debuginfo/emit.rs
index 7a0d8907c50..6160f9b78d8 100644
--- a/src/debuginfo/emit.rs
+++ b/src/debuginfo/emit.rs
@@ -74,10 +74,7 @@ impl WriterRelocate {
 
     /// Perform the collected relocations to be usable for JIT usage.
     #[cfg(feature = "jit")]
-    pub(super) fn relocate_for_jit(
-        mut self,
-        jit_module: &cranelift_jit::JITModule,
-    ) -> Vec<u8> {
+    pub(super) fn relocate_for_jit(mut self, jit_module: &cranelift_jit::JITModule) -> Vec<u8> {
         use std::convert::TryInto;
 
         for reloc in self.relocs.drain(..) {
diff --git a/src/pretty_clif.rs b/src/pretty_clif.rs
index 1326bac74b1..22c94fec82f 100644
--- a/src/pretty_clif.rs
+++ b/src/pretty_clif.rs
@@ -246,37 +246,37 @@ pub(crate) fn write_clif_file<'tcx>(
     context: &cranelift_codegen::Context,
     mut clif_comments: &CommentWriter,
 ) {
-    write_ir_file(tcx, &format!(
-        "{}.{}.clif",
-        tcx.symbol_name(instance).name,
-        postfix
-    ), |file| {
-        let value_ranges = isa.map(|isa| {
-            context
-                .build_value_labels_ranges(isa)
-                .expect("value location ranges")
-        });
+    write_ir_file(
+        tcx,
+        &format!("{}.{}.clif", tcx.symbol_name(instance).name, postfix),
+        |file| {
+            let value_ranges = isa.map(|isa| {
+                context
+                    .build_value_labels_ranges(isa)
+                    .expect("value location ranges")
+            });
 
-        let mut clif = String::new();
-        cranelift_codegen::write::decorate_function(
-            &mut clif_comments,
-            &mut clif,
-            &context.func,
-            &DisplayFunctionAnnotations {
-                isa: Some(&*crate::build_isa(tcx.sess)),
-                value_ranges: value_ranges.as_ref(),
-            },
-        )
-        .unwrap();
+            let mut clif = String::new();
+            cranelift_codegen::write::decorate_function(
+                &mut clif_comments,
+                &mut clif,
+                &context.func,
+                &DisplayFunctionAnnotations {
+                    isa: Some(&*crate::build_isa(tcx.sess)),
+                    value_ranges: value_ranges.as_ref(),
+                },
+            )
+            .unwrap();
 
-        writeln!(file, "test compile")?;
-        writeln!(file, "set is_pic")?;
-        writeln!(file, "set enable_simd")?;
-        writeln!(file, "target {} haswell", crate::target_triple(tcx.sess))?;
-        writeln!(file)?;
-        file.write_all(clif.as_bytes())?;
-        Ok(())
-    });
+            writeln!(file, "test compile")?;
+            writeln!(file, "set is_pic")?;
+            writeln!(file, "set enable_simd")?;
+            writeln!(file, "target {} haswell", crate::target_triple(tcx.sess))?;
+            writeln!(file)?;
+            file.write_all(clif.as_bytes())?;
+            Ok(())
+        },
+    );
 }
 
 impl<M: Module> fmt::Debug for FunctionCx<'_, '_, M> {