From 53ea850d289384ea1810419b980ad73bcd556a04 Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen <ulf.lilleengen@gmail.com> Date: Sat, 20 Jan 2024 16:24:02 +0100 Subject: [PATCH] rustfmt again --- embassy-nrf/src/gpio.rs | 11 ++++------- embassy-nrf/src/rng.rs | 2 +- embassy-nrf/src/time_driver.rs | 2 +- 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; use embassy_hal_internal::{impl_peripheral, into_ref, PeripheralRef}; use self::sealed::Pin as _; - -#[cfg(not(feature = "nrf51"))] -use crate::pac::p0 as gpio; -#[cfg(not(feature = "nrf51"))] -use crate::pac::p0::pin_cnf::{DRIVE_A, PULL_A}; - #[cfg(feature = "nrf51")] use crate::pac::gpio; #[cfg(feature = "nrf51")] use crate::pac::gpio::pin_cnf::{DRIVE_A, PULL_A}; - +#[cfg(not(feature = "nrf51"))] +use crate::pac::p0 as gpio; +#[cfg(not(feature = "nrf51"))] +use crate::pac::p0::pin_cnf::{DRIVE_A, PULL_A}; use crate::{pac, Peripheral}; /// 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; use core::marker::PhantomData; use core::ptr; use core::task::Poll; -use portable_atomic::{AtomicPtr, Ordering}; use embassy_hal_internal::drop::OnDrop; use embassy_hal_internal::{into_ref, PeripheralRef}; use embassy_sync::waitqueue::AtomicWaker; +use portable_atomic::{AtomicPtr, Ordering}; use crate::interrupt::typelevel::Interrupt; use 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 @@ use core::cell::Cell; use core::{mem, ptr}; -use portable_atomic::{compiler_fence, AtomicU32, AtomicU8, Ordering}; use critical_section::CriticalSection; use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex; use embassy_sync::blocking_mutex::CriticalSectionMutex as Mutex; use embassy_time_driver::{AlarmHandle, Driver}; +use portable_atomic::{compiler_fence, AtomicU32, AtomicU8, Ordering}; use crate::interrupt::InterruptExt; use crate::{interrupt, pac};