Cargo fmt

TUM-DSE · Feb 26, 2024 · 6838cd3 · 6838cd3
1 parent c3d07b1
commit 6838cd3
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 10 deletions.
diff --git a/cranelift/codegen/src/ir/types.rs b/cranelift/codegen/src/ir/types.rs
@@ -453,7 +453,11 @@ impl Display for Type {
         } else if self.is_ref() {
             write!(f, "r{}", self.lane_bits())
         } else if self.is_cap_ptr() {
-            assert_eq!(self.lane_bits(), 128, "Only supporting c64 (128 bit) pointers for now");
+            assert_eq!(
+                self.lane_bits(),
+                128,
+                "Only supporting c64 (128 bit) pointers for now"
+            );
             write!(f, "c64")
         } else {
             match *self {
@@ -477,7 +481,11 @@ impl Debug for Type {
         } else if self.is_ref() {
             write!(f, "types::R{}", self.lane_bits())
         } else if self.is_cap_ptr() {
-            assert_eq!(self.lane_bits(), 128, "Only supporting c64 (128 bit) pointers for now");
+            assert_eq!(
+                self.lane_bits(),
+                128,
+                "Only supporting c64 (128 bit) pointers for now"
+            );
             write!(f, "types::C64")
         } else {
             match *self {

diff --git a/cranelift/codegen/src/isa/aarch64/inst/emit.rs b/cranelift/codegen/src/isa/aarch64/inst/emit.rs
@@ -1654,10 +1654,7 @@ impl MachInstEmit for Inst {
                     &Inst::ULoad64Alt { .. } => (0b10000010111, 0b01, 64),
                     &Inst::LoadC64Alt { .. } => (0b11000010111, 0b11, 64),
                     &Inst::SLoad32Alt { .. } => {
-                        assert!(matches!(
-                            &mem,
-                            &CapAMode::Unscaled { .. }
-                        ));
+                        assert!(matches!(&mem, &CapAMode::Unscaled { .. }));
                         (0, 0, 32)
                     }
                     &Inst::FpuLoad32Alt { .. } => todo!(),

diff --git a/crates/cranelift/src/func_environ.rs b/crates/cranelift/src/func_environ.rs
@@ -1782,7 +1782,11 @@ impl<'module_environment> cranelift_wasm::FuncEnvironment for FuncEnvironment<'m
 
     fn make_heap(&mut self, func: &mut ir::Function, index: MemoryIndex) -> WasmResult<Heap> {
         let addr_type = self.pointer_type();
-        let pointer_type = if self.isa.flags().enable_cheri() { C64 } else { self.pointer_type() };
+        let pointer_type = if self.isa.flags().enable_cheri() {
+            C64
+        } else {
+            self.pointer_type()
+        };
         let is_shared = self.module.memory_plans[index].memory.shared;
 
         let min_size = self.module.memory_plans[index]

diff --git a/crates/runtime/src/instance.rs b/crates/runtime/src/instance.rs
@@ -343,7 +343,11 @@ impl Instance {
         unsafe { VMMemoryDefinition::load(self.memory_ptr(index)) }
     }
 
-    unsafe fn write_defined_memory(&self, mem_ptr: *mut VMMemoryDefinition, mem: VMMemoryDefinition) {
+    unsafe fn write_defined_memory(
+        &self,
+        mem_ptr: *mut VMMemoryDefinition,
+        mem: VMMemoryDefinition,
+    ) {
         cfg_if::cfg_if! {
             if #[cfg(all(target_arch = "aarch64", feature = "cheri"))] {
                 // First we write the whole thing. If we are on cheri, we then need to write the capability

diff --git a/crates/runtime/src/memory.rs b/crates/runtime/src/memory.rs
@@ -339,7 +339,10 @@ impl RuntimeLinearMemory for MmapMemory {
     }
 
     fn vmmemory(&mut self) -> VMMemoryDefinition {
-        VMMemoryDefinition::new(unsafe { self.mmap.as_mut_ptr().add(self.pre_guard_size) }, self.accessible)
+        VMMemoryDefinition::new(
+            unsafe { self.mmap.as_mut_ptr().add(self.pre_guard_size) },
+            self.accessible,
+        )
     }
 
     fn needs_init(&self) -> bool {

diff --git a/crates/wasmtime/src/instance.rs b/crates/wasmtime/src/instance.rs
@@ -285,7 +285,7 @@ impl Instance {
                     store: StorePtr::new(store.traitobj()),
                     wmemcheck: store.engine().config().wmemcheck,
                     pkey: store.get_pkey(),
-                    cheri: store.engine().config().cheri
+                    cheri: store.engine().config().cheri,
                 })?;
 
         // The instance still has lots of setup, for example