diff --git a/src/acpi/madt.rs b/src/acpi/madt.rs
index a0a79af486..990c26a624 100644
--- a/src/acpi/madt.rs
+++ b/src/acpi/madt.rs
@@ -193,7 +193,11 @@ impl Madt {
         if &sdt.signature == b"APIC" && sdt.data_len() >= 8 {
             //Not valid if no local address and flags
             let local_address = unsafe { (sdt.data_address() as *const u32).read_unaligned() };
-            let flags = unsafe { (sdt.data_address() as *const u32).offset(1).read_unaligned() };
+            let flags = unsafe {
+                (sdt.data_address() as *const u32)
+                    .offset(1)
+                    .read_unaligned()
+            };
 
             Some(Madt {
                 sdt,
diff --git a/src/acpi/rsdt.rs b/src/acpi/rsdt.rs
index 5c2e9a6692..ce996d8969 100644
--- a/src/acpi/rsdt.rs
+++ b/src/acpi/rsdt.rs
@@ -37,7 +37,11 @@ impl Iterator for RsdtIter {
     type Item = usize;
     fn next(&mut self) -> Option<Self::Item> {
         if self.i < self.sdt.data_len() / mem::size_of::<u32>() {
-            let item = unsafe { (self.sdt.data_address() as *const u32).add(self.i).read_unaligned() };
+            let item = unsafe {
+                (self.sdt.data_address() as *const u32)
+                    .add(self.i)
+                    .read_unaligned()
+            };
             self.i += 1;
             Some(item as usize)
         } else {
diff --git a/src/arch/x86_shared/device/ioapic.rs b/src/arch/x86_shared/device/ioapic.rs
index 6a88b338c7..1123f673bc 100644
--- a/src/arch/x86_shared/device/ioapic.rs
+++ b/src/arch/x86_shared/device/ioapic.rs
@@ -12,8 +12,8 @@ use crate::{
     paging::{entry::EntryFlags, KernelMapper, Page, PageFlags, PhysicalAddress, RmmA, RmmArch},
 };
 
-use crate::arch::cpuid::cpuid;
 use super::pic;
+use crate::arch::cpuid::cpuid;
 
 pub struct IoApicRegs {
     pointer: *const u32,
diff --git a/src/context/mod.rs b/src/context/mod.rs
index 8bb629f032..df0e5c0935 100644
--- a/src/context/mod.rs
+++ b/src/context/mod.rs
@@ -83,12 +83,8 @@ pub fn init() {
 
     unsafe {
         let percpu = PercpuBlock::current();
-        percpu
-            .switch_internals
-            .set_context_id(context.id);
-        percpu
-            .switch_internals
-            .set_idle_id(context.id);
+        percpu.switch_internals.set_context_id(context.id);
+        percpu.switch_internals.set_idle_id(context.id);
     }
 }
 
diff --git a/src/context/switch.rs b/src/context/switch.rs
index 8b349bdec8..a6d760f7f4 100644
--- a/src/context/switch.rs
+++ b/src/context/switch.rs
@@ -265,7 +265,7 @@ pub struct ContextSwitchPercpu {
     context_id: Cell<ContextId>,
 
     // The ID of the idle process
-    idle_id: Cell<ContextId>
+    idle_id: Cell<ContextId>,
 }
 impl ContextSwitchPercpu {
     pub fn context_id(&self) -> ContextId {