Bump rustfmt style to 2024.

wt · wt · commit b3b1e37af5da · 2026-03-10T19:31:29.000-07:00
diff --git a/cortex-m-rt/.rustfmt.toml b/cortex-m-rt/.rustfmt.toml
diff --git a/cortex-m-rt/examples/hard-fault-trampoline.rs b/cortex-m-rt/examples/hard-fault-trampoline.rs
@@ -10,7 +10,7 @@ extern crate cortex_m_rt;
 extern crate panic_halt;
 
 use core::arch::asm;
-use cortex_m_rt::{entry, exception, ExceptionFrame};
+use cortex_m_rt::{ExceptionFrame, entry, exception};
 
 // This defines both `HardFault` and `_HardFault`. Both should have
 // link_section attributes placing them at the end of the .text section,
diff --git a/cortex-m-rt/examples/override-exception.rs b/cortex-m-rt/examples/override-exception.rs
@@ -9,7 +9,7 @@ extern crate cortex_m_rt as rt;
 extern crate panic_halt;
 
 use cortex_m::asm;
-use rt::{entry, exception, ExceptionFrame};
+use rt::{ExceptionFrame, entry, exception};
 
 #[entry]
 fn main() -> ! {
diff --git a/cortex-m-rt/examples/unsafe-hard-fault.rs b/cortex-m-rt/examples/unsafe-hard-fault.rs
@@ -5,7 +5,7 @@
 extern crate cortex_m_rt;
 extern crate panic_halt;
 
-use cortex_m_rt::{entry, exception, ExceptionFrame};
+use cortex_m_rt::{ExceptionFrame, entry, exception};
 
 #[entry]
 fn foo() -> ! {
diff --git a/cortex-m-rt/examples/unsafety.rs b/cortex-m-rt/examples/unsafety.rs
@@ -7,7 +7,7 @@
 extern crate cortex_m_rt;
 extern crate panic_halt;
 
-use cortex_m_rt::{entry, exception, ExceptionFrame};
+use cortex_m_rt::{ExceptionFrame, entry, exception};
 
 #[entry]
 unsafe fn main() -> ! {
diff --git a/cortex-m-rt/examples/warnings.rs b/cortex-m-rt/examples/warnings.rs
@@ -11,7 +11,7 @@
 extern crate cortex_m_rt;
 extern crate panic_halt;
 
-use cortex_m_rt::{entry, exception, interrupt, pre_init, ExceptionFrame};
+use cortex_m_rt::{ExceptionFrame, entry, exception, interrupt, pre_init};
 
 #[allow(non_camel_case_types)]
 enum interrupt {
diff --git a/cortex-m/.rustfmt.toml b/cortex-m/.rustfmt.toml
diff --git a/cortex-m/asm/inline.rs b/cortex-m/asm/inline.rs
@@ -7,7 +7,7 @@
 //! applicable.
 
 use core::arch::asm;
-use core::sync::atomic::{compiler_fence, Ordering};
+use core::sync::atomic::{Ordering, compiler_fence};
 
 #[inline(always)]
 pub unsafe fn __bkpt() {
@@ -228,7 +228,7 @@ pub use self::v7m::*;
 #[cfg(any(armv7m, armv8m_main))]
 mod v7m {
     use core::arch::asm;
-    use core::sync::atomic::{compiler_fence, Ordering};
+    use core::sync::atomic::{Ordering, compiler_fence};
 
     #[inline(always)]
     pub unsafe fn __basepri_max(val: u8) {
diff --git a/cortex-m/src/critical_section.rs b/cortex-m/src/critical_section.rs
@@ -1,4 +1,4 @@
-use critical_section::{set_impl, Impl, RawRestoreState};
+use critical_section::{Impl, RawRestoreState, set_impl};
 
 use crate::interrupt;
 use crate::register::primask;
diff --git a/cortex-m/src/delay.rs b/cortex-m/src/delay.rs
@@ -1,6 +1,6 @@
 //! A delay driver based on SysTick.
 
-use crate::peripheral::{syst::SystClkSource, SYST};
+use crate::peripheral::{SYST, syst::SystClkSource};
 use eh1::delay::DelayNs;
 
 /// System timer (SysTick) as a delay provider.
diff --git a/cortex-m/src/peripheral/scb.rs b/cortex-m/src/peripheral/scb.rs
@@ -4,13 +4,13 @@ use core::ptr;
 
 use volatile_register::RW;
 
-#[cfg(not(armv6m))]
-use super::cpuid::CsselrCacheType;
 #[cfg(not(armv6m))]
 use super::CBP;
 #[cfg(not(armv6m))]
 use super::CPUID;
 use super::SCB;
+#[cfg(not(armv6m))]
+use super::cpuid::CsselrCacheType;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
diff --git a/cortex-m/src/register/primask.rs b/cortex-m/src/register/primask.rs
@@ -3,7 +3,7 @@
 #[cfg(cortex_m)]
 use core::arch::asm;
 #[cfg(cortex_m)]
-use core::sync::atomic::{compiler_fence, Ordering};
+use core::sync::atomic::{Ordering, compiler_fence};
 
 /// All exceptions with configurable priority are ...
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
diff --git a/testsuite/.rustfmt.toml b/testsuite/.rustfmt.toml
diff --git a/testsuite/src/main.rs b/testsuite/src/main.rs
@@ -25,7 +25,7 @@ fn PendSV() {
 
 #[minitest::tests]
 mod tests {
-    use crate::{Ordering, EXCEPTION_FLAG};
+    use crate::{EXCEPTION_FLAG, Ordering};
     use minitest::log;
 
     #[init]
diff --git a/xtask/.rustfmt.toml b/xtask/.rustfmt.toml
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -12,8 +12,12 @@ fn main() {
             eprintln!();
             eprintln!("subcommands:");
             eprintln!("    assemble         Reassemble the pre-built artifacts");
-            eprintln!("    check-blobs      Check that the pre-built artifacts are up-to-date and reproducible");
-            eprintln!("    check-host-side  Build the crate in a non-Cortex-M host application and check host side usage of certain types");
+            eprintln!(
+                "    check-blobs      Check that the pre-built artifacts are up-to-date and reproducible"
+            );
+            eprintln!(
+                "    check-host-side  Build the crate in a non-Cortex-M host application and check host side usage of certain types"
+            );
             process::exit(1);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use critical_section::{set_impl, Impl, RawRestoreState};`
	`1`	`+use critical_section::{Impl, RawRestoreState, set_impl};`
`2`	`2`
`3`	`3`	`use crate::interrupt;`
`4`	`4`	`use crate::register::primask;`