Apply rustfmt to some crates

Rahix · Rahix · commit 9cba3f1252bb · 2022-07-04T21:43:22.000+02:00
diff --git a/arduino-hal/src/simple_pwm.rs b/arduino-hal/src/simple_pwm.rs
@@ -12,4 +12,4 @@ pub use avr_hal_generic::simple_pwm::Prescaler;
 pub use atmega_hal::simple_pwm::*;
 
 #[cfg(feature = "mcu-attiny")]
-pub use attiny_hal::simple_pwm::*;
+pub use attiny_hal::simple_pwm::*;
diff --git a/avr-hal-generic/src/lib.rs b/avr-hal-generic/src/lib.rs
@@ -4,37 +4,37 @@
 
 pub extern crate embedded_hal as hal;
 
+#[doc(hidden)]
+pub extern crate avr_device;
 #[doc(hidden)]
 pub extern crate nb;
 #[doc(hidden)]
-pub extern crate void;
+pub extern crate paste;
 #[doc(hidden)]
 pub extern crate ufmt;
 #[doc(hidden)]
-pub extern crate paste;
-#[doc(hidden)]
-pub extern crate avr_device;
+pub extern crate void;
 
+pub mod adc;
 pub mod clock;
 pub mod delay;
-pub mod port;
-pub mod usart;
 pub mod i2c;
-pub mod spi;
-pub mod adc;
+pub mod port;
 pub mod simple_pwm;
+pub mod spi;
+pub mod usart;
 pub mod wdt;
 
 /// Prelude containing all HAL traits
 pub mod prelude {
-    pub use hal::prelude::*;
-    pub use hal::digital::v2::OutputPin as _;
     pub use hal::digital::v2::InputPin as _;
+    pub use hal::digital::v2::OutputPin as _;
     pub use hal::digital::v2::StatefulOutputPin as _;
     pub use hal::digital::v2::ToggleableOutputPin as _;
-    pub use void::ResultVoidExt as _;
-    pub use void::ResultVoidErrExt as _;
+    pub use hal::prelude::*;
     pub use ufmt::uWrite as _;
+    pub use void::ResultVoidErrExt as _;
+    pub use void::ResultVoidExt as _;
 }
 
 // For making certain traits unimplementable from outside this crate.
diff --git a/avr-hal-generic/src/port.rs b/avr-hal-generic/src/port.rs
@@ -25,7 +25,7 @@ pub mod mode {
     impl crate::Sealed for OpenDrain {}
 
     pub struct PwmOutput<TC> {
-        pub(crate) _timer: PhantomData<TC>
+        pub(crate) _timer: PhantomData<TC>,
     }
     impl<TC> super::PinMode for PwmOutput<TC> {}
     impl<TC> crate::Sealed for PwmOutput<TC> {}
diff --git a/avr-hal-generic/src/simple_pwm.rs b/avr-hal-generic/src/simple_pwm.rs
@@ -2,8 +2,8 @@
 
 use core::marker::PhantomData;
 
-use crate::port::Pin;
 use crate::port::mode;
+use crate::port::Pin;
 
 /// Clock prescaler for PWM
 ///
@@ -55,7 +55,7 @@ impl<TC, PIN: PwmPinOps<TC>> IntoPwmPin<TC, PIN> for Pin<mode::Output, PIN> {
     fn into_pwm(self, _timer: &TC) -> Pin<mode::PwmOutput<TC>, PIN> {
         Pin {
             pin: self.pin,
-            _mode: PhantomData
+            _mode: PhantomData,
         }
     }
 }
@@ -157,4 +157,4 @@ macro_rules! impl_simple_pwm {
             }
         )+
     }
-}
+}
diff --git a/mcu/atmega-hal/src/simple_pwm.rs b/mcu/atmega-hal/src/simple_pwm.rs
@@ -2,7 +2,12 @@ use avr_hal_generic::simple_pwm::Prescaler;
 
 use crate::port::*;
 
-#[cfg(any(feature = "atmega48p", feature = "atmega168", feature = "atmega328p", feature = "atmega328pb"))]
+#[cfg(any(
+    feature = "atmega48p",
+    feature = "atmega168",
+    feature = "atmega328p",
+    feature = "atmega328pb"
+))]
 avr_hal_generic::impl_simple_pwm! {
     /// Use `TC0` for PWM (pins `PD5`, `PD6`)
     ///
@@ -50,7 +55,12 @@ avr_hal_generic::impl_simple_pwm! {
     }
 }
 
-#[cfg(any(feature = "atmega48p", feature = "atmega168", feature = "atmega328p", feature = "atmega328pb"))]
+#[cfg(any(
+    feature = "atmega48p",
+    feature = "atmega168",
+    feature = "atmega328p",
+    feature = "atmega328pb"
+))]
 avr_hal_generic::impl_simple_pwm! {
     /// Use `TC1` for PWM (pins `PB1`, `PB2`)
     ///
@@ -102,7 +112,12 @@ avr_hal_generic::impl_simple_pwm! {
     }
 }
 
-#[cfg(any(feature = "atmega48p", feature = "atmega168", feature = "atmega328p", feature = "atmega328pb"))]
+#[cfg(any(
+    feature = "atmega48p",
+    feature = "atmega168",
+    feature = "atmega328p",
+    feature = "atmega328pb"
+))]
 avr_hal_generic::impl_simple_pwm! {
     /// Use `TC2` for PWM (pins `PB3`, `PD3`)
     ///
@@ -232,8 +247,7 @@ avr_hal_generic::impl_simple_pwm! {
     }
 }
 
-
-#[cfg(any(feature = "atmega1280", feature="atmega2560"))]
+#[cfg(any(feature = "atmega1280", feature = "atmega2560"))]
 avr_hal_generic::impl_simple_pwm! {
     /// Use `TC0` for PWM (pins `PB7`, `PG5`)
     ///
@@ -281,7 +295,7 @@ avr_hal_generic::impl_simple_pwm! {
     }
 }
 
-#[cfg(any(feature = "atmega1280", feature="atmega2560"))]
+#[cfg(any(feature = "atmega1280", feature = "atmega2560"))]
 avr_hal_generic::impl_simple_pwm! {
     /// Use `TC1` for PWM (pins `PB5`, `PB6`, `PB7`)
     ///
@@ -339,7 +353,7 @@ avr_hal_generic::impl_simple_pwm! {
     }
 }
 
-#[cfg(any(feature = "atmega1280", feature="atmega2560"))]
+#[cfg(any(feature = "atmega1280", feature = "atmega2560"))]
 avr_hal_generic::impl_simple_pwm! {
     /// Use `TC2` for PWM (pins `PB4`, `PH6`)
     ///
@@ -392,7 +406,7 @@ avr_hal_generic::impl_simple_pwm! {
     }
 }
 
-#[cfg(any(feature = "atmega1280", feature="atmega2560"))]
+#[cfg(any(feature = "atmega1280", feature = "atmega2560"))]
 avr_hal_generic::impl_simple_pwm! {
     /// Use `TC3` for PWM (pins `PE3`, `PE4`, `PE5`)
     ///
@@ -455,7 +469,7 @@ avr_hal_generic::impl_simple_pwm! {
     }
 }
 
-#[cfg(any(feature = "atmega1280", feature="atmega2560"))]
+#[cfg(any(feature = "atmega1280", feature = "atmega2560"))]
 avr_hal_generic::impl_simple_pwm! {
     /// Use `TC4` for PWM (pins `PH3`, `PH4`, `PH5`)
     ///
@@ -518,7 +532,7 @@ avr_hal_generic::impl_simple_pwm! {
     }
 }
 
-#[cfg(any(feature = "atmega1280", feature="atmega2560"))]
+#[cfg(any(feature = "atmega1280", feature = "atmega2560"))]
 avr_hal_generic::impl_simple_pwm! {
     /// Use `TC5` for PWM (pins `PL3`, `PL4`, `PL5`)
     ///

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ pub mod mode {`
`25`	`25`	`impl crate::Sealed for OpenDrain {}`
`26`	`26`
`27`	`27`	`pub struct PwmOutput<TC> {`
`28`		`- pub(crate) _timer: PhantomData<TC>`
	`28`	`+ pub(crate) _timer: PhantomData<TC>,`
`29`	`29`	`}`
`30`	`30`	`impl<TC> super::PinMode for PwmOutput<TC> {}`
`31`	`31`	`impl<TC> crate::Sealed for PwmOutput<TC> {}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`use core::marker::PhantomData;`
`4`	`4`
`5`		`-use crate::port::Pin;`
`6`	`5`	`use crate::port::mode;`
	`6`	`+use crate::port::Pin;`
`7`	`7`
`8`	`8`	`/// Clock prescaler for PWM`
`9`	`9`	`///`
`@@ -55,7 +55,7 @@ impl<TC, PIN: PwmPinOps<TC>> IntoPwmPin<TC, PIN> for Pin<mode::Output, PIN> {`
`55`	`55`	`fn into_pwm(self, _timer: &TC) -> Pin<mode::PwmOutput<TC>, PIN> {`
`56`	`56`	`Pin {`
`57`	`57`	`pin: self.pin,`
`58`		`- _mode: PhantomData`
	`58`	`+ _mode: PhantomData,`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`}`
`@@ -157,4 +157,4 @@ macro_rules! impl_simple_pwm {`
`157`	`157`	`}`
`158`	`158`	`)+`
`159`	`159`	`}`
`160`		`-}`
	`160`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,12 @@ use avr_hal_generic::simple_pwm::Prescaler;`
`2`	`2`
`3`	`3`	`use crate::port::*;`
`4`	`4`
`5`		`-#[cfg(any(feature = "atmega48p", feature = "atmega168", feature = "atmega328p", feature = "atmega328pb"))]`
	`5`	`+#[cfg(any(`
	`6`	`+ feature = "atmega48p",`
	`7`	`+ feature = "atmega168",`
	`8`	`+ feature = "atmega328p",`
	`9`	`+ feature = "atmega328pb"`
	`10`	`+))]`
`6`	`11`	`avr_hal_generic::impl_simple_pwm! {`
`7`	`12`	/// Use `TC0` for PWM (pins `PD5`, `PD6`)
`8`	`13`	`///`
`@@ -50,7 +55,12 @@ avr_hal_generic::impl_simple_pwm! {`
`50`	`55`	`}`
`51`	`56`	`}`
`52`	`57`
`53`		`-#[cfg(any(feature = "atmega48p", feature = "atmega168", feature = "atmega328p", feature = "atmega328pb"))]`
	`58`	`+#[cfg(any(`
	`59`	`+ feature = "atmega48p",`
	`60`	`+ feature = "atmega168",`
	`61`	`+ feature = "atmega328p",`
	`62`	`+ feature = "atmega328pb"`
	`63`	`+))]`
`54`	`64`	`avr_hal_generic::impl_simple_pwm! {`
`55`	`65`	/// Use `TC1` for PWM (pins `PB1`, `PB2`)
`56`	`66`	`///`
`@@ -102,7 +112,12 @@ avr_hal_generic::impl_simple_pwm! {`
`102`	`112`	`}`
`103`	`113`	`}`
`104`	`114`
`105`		`-#[cfg(any(feature = "atmega48p", feature = "atmega168", feature = "atmega328p", feature = "atmega328pb"))]`
	`115`	`+#[cfg(any(`
	`116`	`+ feature = "atmega48p",`
	`117`	`+ feature = "atmega168",`
	`118`	`+ feature = "atmega328p",`
	`119`	`+ feature = "atmega328pb"`
	`120`	`+))]`
`106`	`121`	`avr_hal_generic::impl_simple_pwm! {`
`107`	`122`	/// Use `TC2` for PWM (pins `PB3`, `PD3`)
`108`	`123`	`///`
`@@ -232,8 +247,7 @@ avr_hal_generic::impl_simple_pwm! {`
`232`	`247`	`}`
`233`	`248`	`}`
`234`	`249`
`235`		`-`
`236`		`-#[cfg(any(feature = "atmega1280", feature="atmega2560"))]`
	`250`	`+#[cfg(any(feature = "atmega1280", feature = "atmega2560"))]`
`237`	`251`	`avr_hal_generic::impl_simple_pwm! {`
`238`	`252`	/// Use `TC0` for PWM (pins `PB7`, `PG5`)
`239`	`253`	`///`
`@@ -281,7 +295,7 @@ avr_hal_generic::impl_simple_pwm! {`
`281`	`295`	`}`
`282`	`296`	`}`
`283`	`297`
`284`		`-#[cfg(any(feature = "atmega1280", feature="atmega2560"))]`
	`298`	`+#[cfg(any(feature = "atmega1280", feature = "atmega2560"))]`
`285`	`299`	`avr_hal_generic::impl_simple_pwm! {`
`286`	`300`	/// Use `TC1` for PWM (pins `PB5`, `PB6`, `PB7`)
`287`	`301`	`///`
`@@ -339,7 +353,7 @@ avr_hal_generic::impl_simple_pwm! {`
`339`	`353`	`}`
`340`	`354`	`}`
`341`	`355`
`342`		`-#[cfg(any(feature = "atmega1280", feature="atmega2560"))]`
	`356`	`+#[cfg(any(feature = "atmega1280", feature = "atmega2560"))]`
`343`	`357`	`avr_hal_generic::impl_simple_pwm! {`
`344`	`358`	/// Use `TC2` for PWM (pins `PB4`, `PH6`)
`345`	`359`	`///`
`@@ -392,7 +406,7 @@ avr_hal_generic::impl_simple_pwm! {`
`392`	`406`	`}`
`393`	`407`	`}`
`394`	`408`
`395`		`-#[cfg(any(feature = "atmega1280", feature="atmega2560"))]`
	`409`	`+#[cfg(any(feature = "atmega1280", feature = "atmega2560"))]`
`396`	`410`	`avr_hal_generic::impl_simple_pwm! {`
`397`	`411`	/// Use `TC3` for PWM (pins `PE3`, `PE4`, `PE5`)
`398`	`412`	`///`
`@@ -455,7 +469,7 @@ avr_hal_generic::impl_simple_pwm! {`
`455`	`469`	`}`
`456`	`470`	`}`
`457`	`471`
`458`		`-#[cfg(any(feature = "atmega1280", feature="atmega2560"))]`
	`472`	`+#[cfg(any(feature = "atmega1280", feature = "atmega2560"))]`
`459`	`473`	`avr_hal_generic::impl_simple_pwm! {`
`460`	`474`	/// Use `TC4` for PWM (pins `PH3`, `PH4`, `PH5`)
`461`	`475`	`///`
`@@ -518,7 +532,7 @@ avr_hal_generic::impl_simple_pwm! {`
`518`	`532`	`}`
`519`	`533`	`}`
`520`	`534`
`521`		`-#[cfg(any(feature = "atmega1280", feature="atmega2560"))]`
	`535`	`+#[cfg(any(feature = "atmega1280", feature = "atmega2560"))]`
`522`	`536`	`avr_hal_generic::impl_simple_pwm! {`
`523`	`537`	/// Use `TC5` for PWM (pins `PL3`, `PL4`, `PL5`)
`524`	`538`	`///`