aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Lilleengen <[email protected]>2024-01-20 16:24:02 +0100
committerUlf Lilleengen <[email protected]>2024-01-24 21:23:54 +0100
commit53ea850d289384ea1810419b980ad73bcd556a04 (patch)
tree05fbc7b91d4afc8a99eee29cd6f00962eb353b35
parent2a810a1a6ad5351ef2248133855dc01ba4b7a76b (diff)
rustfmt again
-rw-r--r--embassy-nrf/src/gpio.rs11
-rw-r--r--embassy-nrf/src/rng.rs2
-rw-r--r--embassy-nrf/src/time_driver.rs2
3 files changed, 6 insertions, 9 deletions
diff --git a/embassy-nrf/src/gpio.rs b/embassy-nrf/src/gpio.rs
index 164363460..b1eb8ae87 100644
--- a/embassy-nrf/src/gpio.rs
+++ b/embassy-nrf/src/gpio.rs
@@ -8,17 +8,14 @@ use cfg_if::cfg_if;
8use embassy_hal_internal::{impl_peripheral, into_ref, PeripheralRef}; 8use embassy_hal_internal::{impl_peripheral, into_ref, PeripheralRef};
9 9
10use self::sealed::Pin as _; 10use self::sealed::Pin as _;
11
12#[cfg(not(feature = "nrf51"))]
13use crate::pac::p0 as gpio;
14#[cfg(not(feature = "nrf51"))]
15use crate::pac::p0::pin_cnf::{DRIVE_A, PULL_A};
16
17#[cfg(feature = "nrf51")] 11#[cfg(feature = "nrf51")]
18use crate::pac::gpio; 12use crate::pac::gpio;
19#[cfg(feature = "nrf51")] 13#[cfg(feature = "nrf51")]
20use crate::pac::gpio::pin_cnf::{DRIVE_A, PULL_A}; 14use crate::pac::gpio::pin_cnf::{DRIVE_A, PULL_A};
21 15#[cfg(not(feature = "nrf51"))]
16use crate::pac::p0 as gpio;
17#[cfg(not(feature = "nrf51"))]
18use crate::pac::p0::pin_cnf::{DRIVE_A, PULL_A};
22use crate::{pac, Peripheral}; 19use crate::{pac, Peripheral};
23 20
24/// A GPIO port with up to 32 pins. 21/// A GPIO port with up to 32 pins.
diff --git a/embassy-nrf/src/rng.rs b/embassy-nrf/src/rng.rs
index 79088b25d..966097578 100644
--- a/embassy-nrf/src/rng.rs
+++ b/embassy-nrf/src/rng.rs
@@ -6,11 +6,11 @@ use core::future::poll_fn;
6use core::marker::PhantomData; 6use core::marker::PhantomData;
7use core::ptr; 7use core::ptr;
8use core::task::Poll; 8use core::task::Poll;
9use portable_atomic::{AtomicPtr, Ordering};
10 9
11use embassy_hal_internal::drop::OnDrop; 10use embassy_hal_internal::drop::OnDrop;
12use embassy_hal_internal::{into_ref, PeripheralRef}; 11use embassy_hal_internal::{into_ref, PeripheralRef};
13use embassy_sync::waitqueue::AtomicWaker; 12use embassy_sync::waitqueue::AtomicWaker;
13use portable_atomic::{AtomicPtr, Ordering};
14 14
15use crate::interrupt::typelevel::Interrupt; 15use crate::interrupt::typelevel::Interrupt;
16use crate::{interrupt, Peripheral}; 16use crate::{interrupt, Peripheral};
diff --git a/embassy-nrf/src/time_driver.rs b/embassy-nrf/src/time_driver.rs
index 855d133df..0f31c5c9c 100644
--- a/embassy-nrf/src/time_driver.rs
+++ b/embassy-nrf/src/time_driver.rs
@@ -1,11 +1,11 @@
1use core::cell::Cell; 1use core::cell::Cell;
2use core::{mem, ptr}; 2use core::{mem, ptr};
3use portable_atomic::{compiler_fence, AtomicU32, AtomicU8, Ordering};
4 3
5use critical_section::CriticalSection; 4use critical_section::CriticalSection;
6use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex; 5use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
7use embassy_sync::blocking_mutex::CriticalSectionMutex as Mutex; 6use embassy_sync::blocking_mutex::CriticalSectionMutex as Mutex;
8use embassy_time_driver::{AlarmHandle, Driver}; 7use embassy_time_driver::{AlarmHandle, Driver};
8use portable_atomic::{compiler_fence, AtomicU32, AtomicU8, Ordering};
9 9
10use crate::interrupt::InterruptExt; 10use crate::interrupt::InterruptExt;
11use crate::{interrupt, pac}; 11use crate::{interrupt, pac};