Fix formatting

Author: wbuck

examples/can.rs

@@ -13,8 +13,8 @@ use cortex_m_rt::entry;
 
 use hal::prelude::*;
 use hal::stm32;
-use hal::watchdog::IndependentWatchDog;
 use hal::time::{duration::*, rate::*};
+use hal::watchdog::IndependentWatchDog;
 
 use hal::can::{Can, CanFilter, CanFrame, CanId, Filter, Frame, Receiver, Transmitter};
 use nb::block;

examples/i2c_scanner.rs

@@ -16,8 +16,8 @@ use cortex_m::asm;
 use cortex_m_rt::entry;
 use cortex_m_semihosting::{hprint, hprintln};
 
-use stm32f3xx_hal::{self as hal, pac, prelude::*};
 use hal::time::rate::*;
+use stm32f3xx_hal::{self as hal, pac, prelude::*};
 
 const VALID_ADDR_RANGE: Range<u8> = 0x08..0x78;
 
@@ -36,12 +36,14 @@ fn main() -> ! {
         gpiob.pb6.into_af4(&mut gpiob.moder, &mut gpiob.afrl), // SCL
         gpiob.pb7.into_af4(&mut gpiob.moder, &mut gpiob.afrl), // SDA
     );
+
     let mut i2c = hal::i2c::I2c::new(
-        dp.I2C1, 
-        pins, 
-        Hertz::try_from(100u32.kHz()).unwrap(), 
-        clocks, 
-        &mut rcc.apb1);
+        dp.I2C1,
+        pins,
+        Hertz::try_from(100u32.kHz()).unwrap(),
+        clocks,
+        &mut rcc.apb1,
+    );
 
     hprintln!("Start i2c scanning...").expect("Error using hprintln.");
     hprintln!().unwrap();

examples/pwm.rs

@@ -30,7 +30,10 @@ fn main() -> ! {
     // Configure our clocks
     let mut flash = dp.FLASH.constrain();
     let mut rcc = dp.RCC.constrain();
-    let clocks = rcc.cfgr.sysclk(Hertz::try_from(16u32.MHz()).unwrap()).freeze(&mut flash.acr);
+    let clocks = rcc
+        .cfgr
+        .sysclk(Hertz::try_from(16u32.MHz()).unwrap())
+        .freeze(&mut flash.acr);
 
     // Prep the pins we need in their correct alternate function
     let mut gpioa = dp.GPIOA.split(&mut rcc.ahb);
@@ -54,9 +57,9 @@ fn main() -> ! {
     // A four channel general purpose timer that's broadly available
     let tim3_channels = tim3(
         dp.TIM3,
-        1280,    // resolution of duty cycle
+        1280,       // resolution of duty cycle
         50u32.Hz(), // frequency of period
-        &clocks, // To get the timer's clock speed
+        &clocks,    // To get the timer's clock speed
     );
 
     // Channels without pins cannot be enabled, so we can't forget to
@@ -103,9 +106,9 @@ fn main() -> ! {
     // A 32-bit timer, so we can set a larger resolution
     let tim2_channels = tim2(
         dp.TIM2,
-        160000,  // resolution of duty cycle
+        160000,     // resolution of duty cycle
         50u32.Hz(), // frequency of period
-        &clocks, // To get the timer's clock speed
+        &clocks,    // To get the timer's clock speed
     );
 
     let mut tim2_ch3 = tim2_channels.2.output_to_pb10(pb10);
@@ -118,9 +121,9 @@ fn main() -> ! {
     // just use it directly
     let mut tim16_ch1 = tim16(
         dp.TIM16,
-        1280,    // resolution of duty cycle
+        1280,       // resolution of duty cycle
         50u32.Hz(), // frequency of period
-        &clocks, // To get the timer's clock speed
+        &clocks,    // To get the timer's clock speed
     )
     .output_to_pb8(pb8);
     tim16_ch1.set_duty(tim16_ch1.get_max_duty() / 20); // 5% duty cyle
@@ -132,9 +135,9 @@ fn main() -> ! {
     // to complementary pins (works just like standard pins)
     let tim8_channels = tim8(
         dp.TIM8,
-        1280,    // resolution of duty cycle
+        1280,       // resolution of duty cycle
         50u32.Hz(), // frequency of period
-        &clocks, // To get the timer's clock speed
+        &clocks,    // To get the timer's clock speed
     );
 
     let mut tim8_ch1 = tim8_channels.0.output_to_pc10(pc10);

examples/serial_dma.rs

@@ -9,8 +9,7 @@ use panic_semihosting as _;
 
 use cortex_m::{asm, singleton};
 use cortex_m_rt::entry;
-use stm32f3xx_hal::{pac, prelude::*, serial::Serial};
-use stm32f3xx_hal::time::rate::*;
+use stm32f3xx_hal::{pac, prelude::*, serial::Serial, time::rate::*};
 
 #[entry]
 fn main() -> ! {

examples/usb_serial.rs

@@ -14,8 +14,8 @@ use core::convert::TryFrom;
 
 use hal::pac;
 use hal::prelude::*;
-use hal::usb::{Peripheral, UsbBus};
 use hal::time::rate::*;
+use hal::usb::{Peripheral, UsbBus};
 
 use usb_device::prelude::*;
 use usbd_serial::{SerialPort, USB_CLASS_CDC};

src/serial.rs

@@ -5,7 +5,7 @@ use crate::{
     hal::{blocking, serial},
     pac::{USART1, USART2, USART3},
     rcc::{Clocks, APB1, APB2},
-    time::rate::Baud
+    time::rate::Baud,
 };
 
 use cfg_if::cfg_if;

src/spi.rs

@@ -131,8 +131,8 @@ use crate::rcc::APB1;
     feature = "stm32f398"
 ))]
 use crate::rcc::APB2;
-use core::marker::PhantomData;
 use crate::time::rate::Hertz;
+use core::marker::PhantomData;
 
 /// SPI error
 #[derive(Debug)]

src/timer.rs

@@ -50,11 +50,9 @@ use crate::pac::{TIM15, TIM16, TIM17, TIM2, TIM6};
     feature = "stm32f398"
 ))]
 use crate::pac::{TIM3, TIM7};
-
-use void::Void;
-use crate::time::rate::Hertz;
 use crate::rcc::{Clocks, APB1, APB2};
-
+use crate::time::rate::Hertz;
+use void::Void;
 
 /// Associated clocks with timers
 pub trait PclkSrc {

tests/rcc.rs

@@ -124,7 +124,7 @@ mod tests {
         let clock = rcc
             .cfgr
             .use_hse(Hertz::try_from(8u32.MHz()).unwrap())
-            .sysclk( Hertz::try_from(48u32.MHz()).unwrap())
+            .sysclk(Hertz::try_from(48u32.MHz()).unwrap())
             .freeze(&mut flash.acr); // works
 
         defmt::assert!(clock.sysclk() == 48u32.MHz());
@@ -168,8 +168,8 @@ mod tests {
         let clock = rcc
             .cfgr
             .use_hse(Hertz::try_from(8u32.MHz()).unwrap())
-            .pclk1(  Hertz::try_from(16u32.MHz()).unwrap())
-            .sysclk( Hertz::try_from(64u32.MHz()).unwrap())
+            .pclk1(Hertz::try_from(16u32.MHz()).unwrap())
+            .sysclk(Hertz::try_from(64u32.MHz()).unwrap())
             .freeze(&mut flash.acr);
 
         defmt::assert!(clock.sysclk() == 64u32.MHz());
@@ -191,7 +191,7 @@ mod tests {
         let clock = rcc
             .cfgr
             .use_hse(Hertz::try_from(8u32.MHz()).unwrap())
-            .sysclk( Hertz::try_from(72u32.MHz()).unwrap())
+            .sysclk(Hertz::try_from(72u32.MHz()).unwrap())
             .freeze(&mut flash.acr);
 
         defmt::assert!(clock.sysclk() == 72u32.MHz());