Run rustfmt

Fix up various formatting issues that have crept in.

Signed-off-by: David Brown <[email protected]>

Author: d3zd3z

tests/drivers/gpio-async/src/lib.rs

@@ -5,7 +5,10 @@
 
 extern crate alloc;
 
-use zephyr::{embassy::Executor, raw::{GPIO_INPUT, GPIO_OUTPUT_ACTIVE, GPIO_PULL_DOWN}};
+use zephyr::{
+    embassy::Executor,
+    raw::{GPIO_INPUT, GPIO_OUTPUT_ACTIVE, GPIO_PULL_DOWN},
+};
 
 use embassy_executor::Spawner;
 use log::info;

zephyr-build/src/devicetree/augment.rs

@@ -140,7 +140,11 @@ pub enum Action {
 impl Action {
     fn generate(&self, _name: &Ident, node: &Node, tree: &DeviceTree) -> TokenStream {
         match self {
-            Action::Instance { raw, device, static_type } => raw.generate(node, device, static_type.as_deref()),
+            Action::Instance {
+                raw,
+                device,
+                static_type,
+            } => raw.generate(node, device, static_type.as_deref()),
             Action::Labels => {
                 let nodes = tree.labels.iter().map(|(k, v)| {
                     let name = dt_to_lower_id(k);

zephyr/src/device/gpio.rs

@@ -20,11 +20,22 @@ mod async_io {
     //! the largest number currently used, although this might change with 64-bit targest in the
     //! future.
 
-    use core::{cell::UnsafeCell, ffi::c_int, future::Future, mem, sync::atomic::Ordering, task::{Poll, Waker}};
+    use core::{
+        cell::UnsafeCell,
+        ffi::c_int,
+        future::Future,
+        mem,
+        sync::atomic::Ordering,
+        task::{Poll, Waker},
+    };
 
     use embassy_sync::waitqueue::AtomicWaker;
     use portable_atomic::AtomicBool;
-    use zephyr_sys::{device, gpio_add_callback, gpio_callback, gpio_init_callback, gpio_pin_get, gpio_pin_interrupt_configure, gpio_pin_interrupt_configure_dt, gpio_port_pins_t, GPIO_INT_LEVEL_HIGH, GPIO_INT_LEVEL_LOW, ZR_GPIO_INT_MODE_DISABLE_ONLY};
+    use zephyr_sys::{
+        device, gpio_add_callback, gpio_callback, gpio_init_callback, gpio_pin_get,
+        gpio_pin_interrupt_configure, gpio_pin_interrupt_configure_dt, gpio_port_pins_t,
+        GPIO_INT_LEVEL_HIGH, GPIO_INT_LEVEL_LOW, ZR_GPIO_INT_MODE_DISABLE_ONLY,
+    };
 
     use crate::printkln;
 
@@ -94,11 +105,15 @@ mod async_io {
             }
         }
 
-        extern "C" fn callback_handler(port: *const device, cb: *mut gpio_callback, mut pins: gpio_port_pins_t) {
-            let data = unsafe { cb
-                .cast::<u8>()
-                .sub(mem::offset_of!(Self, callback))
-                .cast::<Self>()
+        extern "C" fn callback_handler(
+            port: *const device,
+            cb: *mut gpio_callback,
+            mut pins: gpio_port_pins_t,
+        ) {
+            let data = unsafe {
+                cb.cast::<u8>()
+                    .sub(mem::offset_of!(Self, callback))
+                    .cast::<Self>()
             };
 
             // printkln!("CB called: pins: {pins:#x}");
@@ -136,7 +151,10 @@ mod async_io {
         /// The `_token` enforces single use of gpios.  Note that this makes it impossible to wait for
         /// more than one GPIO.
         ///
-        pub unsafe fn wait_for_high(&mut self, _token: &mut GpioToken) -> impl Future<Output = ()> + use<'_> {
+        pub unsafe fn wait_for_high(
+            &mut self,
+            _token: &mut GpioToken,
+        ) -> impl Future<Output = ()> + use<'_> {
             GpioWait::new(self, 1)
         }
 
@@ -146,7 +164,10 @@ mod async_io {
         ///
         /// The `_token` enforces single use of gpios.  Note that this makes it impossible to wait
         /// for more than one GPIO.
-        pub unsafe fn wait_for_low(&mut self, _token: &mut GpioToken) -> impl Future<Output = ()> + use<'_> {
+        pub unsafe fn wait_for_low(
+            &mut self,
+            _token: &mut GpioToken,
+        ) -> impl Future<Output = ()> + use<'_> {
             GpioWait::new(self, 0)
         }
     }
@@ -159,17 +180,17 @@ mod async_io {
 
     impl<'a> GpioWait<'a> {
         fn new(pin: &'a mut GpioPin, level: u8) -> Self {
-            Self {
-                pin,
-                level,
-            }
+            Self { pin, level }
         }
     }
 
     impl<'a> Future for GpioWait<'a> {
         type Output = ();
 
-        fn poll(self: core::pin::Pin<&mut Self>, cx: &mut core::task::Context<'_>) -> core::task::Poll<Self::Output> {
+        fn poll(
+            self: core::pin::Pin<&mut Self>,
+            cx: &mut core::task::Context<'_>,
+        ) -> core::task::Poll<Self::Output> {
             self.pin.data.fast_install(self.pin.pin.port);
 
             self.pin.data.register(self.pin.pin.pin, cx.waker());
@@ -256,7 +277,11 @@ impl Gpio {
     ///
     /// TODO: Guarantee single instancing.
     #[allow(dead_code)]
-    pub(crate) unsafe fn new(unique: &Unique, data: &'static GpioStatic, device: *const raw::device) -> Option<Gpio> {
+    pub(crate) unsafe fn new(
+        unique: &Unique,
+        data: &'static GpioStatic,
+        device: *const raw::device,
+    ) -> Option<Gpio> {
         if !unique.once() {
             return None;
         }