Skip to content

Commit 4ccdf2a

Browse files
committed
Bump rustfmt style to 2024.
Needed to update the assembled libs because the formatting touched the asm boilerplate.
1 parent 88c5106 commit 4ccdf2a

23 files changed

Lines changed: 19 additions & 19 deletions

cortex-m-rt/.rustfmt.toml

Lines changed: 0 additions & 1 deletion
This file was deleted.

cortex-m-rt/examples/hard-fault-trampoline.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extern crate cortex_m_rt;
1010
extern crate panic_halt;
1111

1212
use core::arch::asm;
13-
use cortex_m_rt::{entry, exception, ExceptionFrame};
13+
use cortex_m_rt::{ExceptionFrame, entry, exception};
1414

1515
// This defines both `HardFault` and `_HardFault`. Both should have
1616
// link_section attributes placing them at the end of the .text section,

cortex-m-rt/examples/override-exception.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ extern crate cortex_m_rt as rt;
99
extern crate panic_halt;
1010

1111
use cortex_m::asm;
12-
use rt::{entry, exception, ExceptionFrame};
12+
use rt::{ExceptionFrame, entry, exception};
1313

1414
#[entry]
1515
fn main() -> ! {

cortex-m-rt/examples/unsafe-hard-fault.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
extern crate cortex_m_rt;
66
extern crate panic_halt;
77

8-
use cortex_m_rt::{entry, exception, ExceptionFrame};
8+
use cortex_m_rt::{ExceptionFrame, entry, exception};
99

1010
#[entry]
1111
fn foo() -> ! {

cortex-m-rt/examples/unsafety.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
extern crate cortex_m_rt;
88
extern crate panic_halt;
99

10-
use cortex_m_rt::{entry, exception, ExceptionFrame};
10+
use cortex_m_rt::{ExceptionFrame, entry, exception};
1111

1212
#[entry]
1313
unsafe fn main() -> ! {

cortex-m-rt/examples/warnings.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
extern crate cortex_m_rt;
1212
extern crate panic_halt;
1313

14-
use cortex_m_rt::{entry, exception, interrupt, pre_init, ExceptionFrame};
14+
use cortex_m_rt::{ExceptionFrame, entry, exception, interrupt, pre_init};
1515

1616
#[allow(non_camel_case_types)]
1717
enum interrupt {

cortex-m/.rustfmt.toml

Lines changed: 0 additions & 1 deletion
This file was deleted.

cortex-m/asm/inline.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//! applicable.
88
99
use core::arch::asm;
10-
use core::sync::atomic::{compiler_fence, Ordering};
10+
use core::sync::atomic::{Ordering, compiler_fence};
1111

1212
#[inline(always)]
1313
pub unsafe fn __bkpt() {
@@ -228,7 +228,7 @@ pub use self::v7m::*;
228228
#[cfg(any(armv7m, armv8m_main))]
229229
mod v7m {
230230
use core::arch::asm;
231-
use core::sync::atomic::{compiler_fence, Ordering};
231+
use core::sync::atomic::{Ordering, compiler_fence};
232232

233233
#[inline(always)]
234234
pub unsafe fn __basepri_max(val: u8) {
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)