diff --git a/.rustfmt.toml b/.rustfmt.toml
index 63ae5375e7..a6c3ce554b 100644
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -1,6 +1,8 @@
 imports_granularity = "item"
 group_imports = "StdExternalCrate"
 unstable_features = true
+wrap_comments = true
+comment_width = 100
 use_field_init_shorthand = true
 use_try_shorthand = true
 edition = "2021"
diff --git a/devices/src/irqchip/apic.rs b/devices/src/irqchip/apic.rs
index 5dc59a5769..240199e75d 100644
--- a/devices/src/irqchip/apic.rs
+++ b/devices/src/irqchip/apic.rs
@@ -1331,6 +1331,7 @@ mod tests {
 
         // Top 8 bits of ICR high are the destination.
         a.write(Reg::INTERRUPT_COMMAND_HI as u64, &[0, 0, 0, 42]);
+        #[rustfmt::skip]
         let msg = a.write(
             Reg::INTERRUPT_COMMAND_LO as u64,
             &[