code cleanup

Author: dotcypress

examples/adc_ext_trig_double_dma_serial.rs

@@ -23,13 +23,11 @@ use rt::entry;
 use core::cell::RefCell;
 use cortex_m::interrupt::Mutex;
 
-use crate::hal::stm32::{interrupt, Interrupt};
-use hal::analog::adc::{InjTrigSource, Precision, SampleTime}; //, VTemp
-
-use hal::dma::{self, Target, Channel};
-
 use crate::hal::analog::adc::DmaMode;
 use crate::hal::analog::adc::InjectMode;
+use crate::hal::stm32::{interrupt, Interrupt};
+use hal::analog::adc::{InjTrigSource, Precision, SampleTime}; //, VTemp
+use hal::dma::{self, Channel, Target};
 
 // Make dma globally available
 static G_DMA: Mutex<RefCell<Option<hal::dma::Channels>>> = Mutex::new(RefCell::new(None));

examples/dac.rs

@@ -12,10 +12,10 @@ extern crate panic_halt;
 extern crate stm32g0xx_hal as hal;
 
 use hal::analog::dac::GeneratorConfig;
-use hal::timer::qei::Direction;
 use hal::prelude::*;
 use hal::rcc::Config;
 use hal::stm32;
+use hal::timer::qei::Direction;
 use rt::entry;
 
 #[entry]

src/analog/adc.rs

@@ -277,8 +277,11 @@ impl Adc {
             adc_mv as u16
         })
     }
-    
-    pub fn read<PIN: Channel<Adc, ID = u8>>(&mut self, _pin: &mut PIN) -> nb::Result<u16, Infallible> {
+
+    pub fn read<PIN: Channel<Adc, ID = u8>>(
+        &mut self,
+        _pin: &mut PIN,
+    ) -> nb::Result<u16, Infallible> {
         self.power_up();
         self.rb.cfgr1.modify(|_, w| {
             w.res()

src/dma.rs

@@ -334,7 +334,6 @@ macro_rules! dma {
     }
 }
 
-
 #[cfg(any(feature = "stm32g070", feature = "stm32g071", feature = "stm32g081"))]
 dma!(
     channels: {

src/gpio.rs

@@ -3,7 +3,7 @@ use core::marker::PhantomData;
 
 use crate::rcc::Rcc;
 use core::convert::Infallible;
-use hal::digital::{InputPin, OutputPin, StatefulOutputPin, ErrorType, PinState};
+use hal::digital::{ErrorType, InputPin, OutputPin, PinState, StatefulOutputPin};
 
 /// Default pin mode
 pub type DefaultMode = Analog;

src/prelude.rs

@@ -1,4 +1,3 @@
-pub use hal::digital::*;
 pub use crate::analog::adc::AdcExt as _;
 #[cfg(any(feature = "stm32g071", feature = "stm32g081"))]
 pub use crate::analog::comparator::ComparatorExt as _;
@@ -12,6 +11,7 @@ pub use crate::analog::dac::DacExt as _;
 pub use crate::analog::dac::DacOut as _;
 pub use crate::crc::CrcExt as _;
 pub use crate::timer::delay::DelayExt as _;
+pub use hal::digital::*;
 // pub use crate::dma::CopyDma as _;
 pub use crate::dma::DmaExt as _;
 // pub use crate::dma::ReadDma as _;

src/serial/usart.rs

@@ -1,11 +1,11 @@
-use core::fmt;
-use core::marker::PhantomData;
 use crate::dma;
 use crate::dmamux::DmaMuxIndex;
 use crate::gpio::{AltFunction, *};
 use crate::rcc::*;
 use crate::serial::config::*;
 use crate::stm32::*;
+use core::fmt;
+use core::marker::PhantomData;
 use cortex_m::interrupt;
 use nb::block;
 
@@ -530,7 +530,6 @@ macro_rules! uart_basic {
                     .write(|w| unsafe { w.bits(event.val() & mask) });
             }
         }
-    
 
         impl fmt::Write for Tx<$USARTX, BasicConfig> {
             fn write_str(&mut self, s: &str) -> fmt::Result {

src/timer/mod.rs

@@ -69,7 +69,6 @@ impl Timer<SYST> {
     }
 }
 
-
 pub trait TimerExt<TIM> {
     fn timer(self, rcc: &mut Rcc) -> Timer<TIM>;
 }