Remove unneeded rustfmt::skip

embassy-lora/src/sx127x/mod.rs

@@ -89,8 +89,15 @@ where
 {
     type PhyError = Sx127xError;
 
-    #[rustfmt::skip]
+    type TxFuture<'m>
-    type TxFuture<'m> where SPI: 'm, CS: 'm, RESET: 'm, E: 'm, I: 'm, RFS: 'm = impl Future<Output = Result<u32, Self::PhyError>> + 'm;
+    where
+        SPI: 'm,
+        CS: 'm,
+        RESET: 'm,
+        E: 'm,
+        I: 'm,
+        RFS: 'm,
+    = impl Future<Output = Result<u32, Self::PhyError>> + 'm;
 
     fn tx<'m>(&'m mut self, config: TxConfig, buf: &'m [u8]) -> Self::TxFuture<'m> {
         trace!("TX START");
@@ -130,8 +137,15 @@ where
         }
     }
 
-    #[rustfmt::skip]
+    type RxFuture<'m>
-    type RxFuture<'m> where SPI: 'm, CS: 'm, RESET: 'm, E: 'm, I: 'm, RFS: 'm = impl Future<Output = Result<(usize, RxQuality), Self::PhyError>> + 'm;
+    where
+        SPI: 'm,
+        CS: 'm,
+        RESET: 'm,
+        E: 'm,
+        I: 'm,
+        RFS: 'm,
+    = impl Future<Output = Result<(usize, RxQuality), Self::PhyError>> + 'm;
 
     fn rx<'m>(&'m mut self, config: RfConfig, buf: &'m mut [u8]) -> Self::RxFuture<'m> {
         trace!("RX START");

embassy-nrf/src/gpio.rs

@@ -75,8 +75,10 @@ impl<'d, T: Pin> InputPin for Input<'d, T> {
 
 #[cfg(feature = "gpiote")]
 impl<'d, T: Pin> embassy::traits::gpio::WaitForHigh for Input<'d, T> {
-    #[rustfmt::skip]
+    type Future<'a>
-    type Future<'a> where Self: 'a = impl Future<Output=()> + Unpin + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = ()> + Unpin + 'a;
 
     fn wait_for_high<'a>(&'a mut self) -> Self::Future<'a> {
         self.pin.conf().modify(|_, w| w.sense().high());
@@ -90,8 +92,10 @@ impl<'d, T: Pin> embassy::traits::gpio::WaitForHigh for Input<'d, T> {
 
 #[cfg(feature = "gpiote")]
 impl<'d, T: Pin> embassy::traits::gpio::WaitForLow for Input<'d, T> {
-    #[rustfmt::skip]
+    type Future<'a>
-    type Future<'a> where Self: 'a = impl Future<Output=()> + Unpin + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = ()> + Unpin + 'a;
 
     fn wait_for_low<'a>(&'a mut self) -> Self::Future<'a> {
         self.pin.conf().modify(|_, w| w.sense().low());
@@ -105,8 +109,10 @@ impl<'d, T: Pin> embassy::traits::gpio::WaitForLow for Input<'d, T> {
 
 #[cfg(feature = "gpiote")]
 impl<'d, T: Pin> embassy::traits::gpio::WaitForAnyEdge for Input<'d, T> {
-    #[rustfmt::skip]
+    type Future<'a>
-    type Future<'a> where Self: 'a = impl Future<Output=()> + Unpin + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = ()> + Unpin + 'a;
 
     fn wait_for_any_edge<'a>(&'a mut self) -> Self::Future<'a> {
         if self.is_high().ok().unwrap() {
@@ -328,8 +334,10 @@ impl<'d, T: Pin> StatefulOutputPin for FlexPin<'d, T> {
 
 #[cfg(feature = "gpiote")]
 impl<'d, T: Pin> embassy::traits::gpio::WaitForHigh for FlexPin<'d, T> {
-    #[rustfmt::skip]
+    type Future<'a>
-    type Future<'a> where Self: 'a = impl Future<Output=()> + Unpin + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = ()> + Unpin + 'a;
 
     fn wait_for_high<'a>(&'a mut self) -> Self::Future<'a> {
         self.pin.conf().modify(|_, w| w.sense().high());
@@ -343,8 +351,10 @@ impl<'d, T: Pin> embassy::traits::gpio::WaitForHigh for FlexPin<'d, T> {
 
 #[cfg(feature = "gpiote")]
 impl<'d, T: Pin> embassy::traits::gpio::WaitForLow for FlexPin<'d, T> {
-    #[rustfmt::skip]
+    type Future<'a>
-    type Future<'a> where Self: 'a = impl Future<Output=()> + Unpin + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = ()> + Unpin + 'a;
 
     fn wait_for_low<'a>(&'a mut self) -> Self::Future<'a> {
         self.pin.conf().modify(|_, w| w.sense().low());
@@ -358,8 +368,10 @@ impl<'d, T: Pin> embassy::traits::gpio::WaitForLow for FlexPin<'d, T> {
 
 #[cfg(feature = "gpiote")]
 impl<'d, T: Pin> embassy::traits::gpio::WaitForAnyEdge for FlexPin<'d, T> {
-    #[rustfmt::skip]
+    type Future<'a>
-    type Future<'a> where Self: 'a = impl Future<Output=()> + Unpin + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = ()> + Unpin + 'a;
 
     fn wait_for_any_edge<'a>(&'a mut self) -> Self::Future<'a> {
         if self.is_high().ok().unwrap() {

embassy-nrf/src/qspi.rs

@@ -286,12 +286,18 @@ impl<'d, T: Instance> Drop for Qspi<'d, T> {
 }
 
 impl<'d, T: Instance> Flash for Qspi<'d, T> {
-    #[rustfmt::skip]
+    type ReadFuture<'a>
-    type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), Error>> + 'a;
+    where
-    #[rustfmt::skip]
+        Self: 'a,
-    type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), Error>> + 'a;
+    = impl Future<Output = Result<(), Error>> + 'a;
-    #[rustfmt::skip]
+    type WriteFuture<'a>
-    type ErasePageFuture<'a> where Self: 'a = impl Future<Output = Result<(), Error>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), Error>> + 'a;
+    type ErasePageFuture<'a>
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), Error>> + 'a;
 
     fn read<'a>(&'a mut self, address: usize, data: &'a mut [u8]) -> Self::ReadFuture<'a> {
         async move {

embassy-nrf/src/rng.rs

@@ -157,8 +157,10 @@ impl<'d> Drop for Rng<'d> {
 impl<'d> traits::rng::Rng for Rng<'d> {
     type Error = Infallible;
 
-    #[rustfmt::skip] // For some reason rustfmt removes the where clause
+    type RngFuture<'a>
-    type RngFuture<'a> where 'd: 'a = impl Future<Output = Result<(), Self::Error>> + 'a;
+    where
+        'd: 'a,
+    = impl Future<Output = Result<(), Self::Error>> + 'a;
 
     fn fill_bytes<'a>(&'a mut self, dest: &'a mut [u8]) -> Self::RngFuture<'a> {
         async move {

embassy-nrf/src/spim.rs

@@ -182,8 +182,10 @@ impl<'d, T: Instance> Spi<u8> for Spim<'d, T> {
 }
 
 impl<'d, T: Instance> Read<u8> for Spim<'d, T> {
-    #[rustfmt::skip]
+    type ReadFuture<'a>
-    type ReadFuture<'a> where Self: 'a = impl Future<Output=Result<(), Self::Error>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), Self::Error>> + 'a;
 
     fn read<'a>(&'a mut self, data: &'a mut [u8]) -> Self::ReadFuture<'a> {
         self.read_write(data, &[])
@@ -191,8 +193,10 @@ impl<'d, T: Instance> Read<u8> for Spim<'d, T> {
 }
 
 impl<'d, T: Instance> Write<u8> for Spim<'d, T> {
-    #[rustfmt::skip]
+    type WriteFuture<'a>
-    type WriteFuture<'a> where Self: 'a = impl Future<Output=Result<(), Self::Error>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), Self::Error>> + 'a;
 
     fn write<'a>(&'a mut self, data: &'a [u8]) -> Self::WriteFuture<'a> {
         self.read_write(&mut [], data)
@@ -200,8 +204,10 @@ impl<'d, T: Instance> Write<u8> for Spim<'d, T> {
 }
 
 impl<'d, T: Instance> FullDuplex<u8> for Spim<'d, T> {
-    #[rustfmt::skip]
+    type WriteReadFuture<'a>
-    type WriteReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), Self::Error>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), Self::Error>> + 'a;
 
     fn read_write<'a>(&'a mut self, rx: &'a mut [u8], tx: &'a [u8]) -> Self::WriteReadFuture<'a> {
         async move {

embassy-nrf/src/twim.rs

@@ -469,12 +469,18 @@ where
 {
     type Error = Error;
 
-    #[rustfmt::skip]
+    type WriteFuture<'a>
-    type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), Self::Error>> + 'a;
+    where
-    #[rustfmt::skip]
+        Self: 'a,
-    type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), Self::Error>> + 'a;
+    = impl Future<Output = Result<(), Self::Error>> + 'a;
-    #[rustfmt::skip]
+    type ReadFuture<'a>
-    type WriteReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), Self::Error>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), Self::Error>> + 'a;
+    type WriteReadFuture<'a>
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), Self::Error>> + 'a;
 
     fn read<'a>(&'a mut self, address: u8, buffer: &'a mut [u8]) -> Self::ReadFuture<'a> {
         async move {

embassy-nrf/src/uarte.rs

@@ -167,8 +167,10 @@ impl<'d, T: Instance> Uarte<'d, T> {
 }
 
 impl<'d, T: Instance> Read for Uarte<'d, T> {
-    #[rustfmt::skip]
+    type ReadFuture<'a>
-    type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), TraitError>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), TraitError>> + 'a;
 
     fn read<'a>(&'a mut self, rx_buffer: &'a mut [u8]) -> Self::ReadFuture<'a> {
         self.rx.read(rx_buffer)
@@ -176,8 +178,10 @@ impl<'d, T: Instance> Read for Uarte<'d, T> {
 }
 
 impl<'d, T: Instance> Write for Uarte<'d, T> {
-    #[rustfmt::skip]
+    type WriteFuture<'a>
-    type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), TraitError>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), TraitError>> + 'a;
 
     fn write<'a>(&'a mut self, tx_buffer: &'a [u8]) -> Self::WriteFuture<'a> {
         self.tx.write(tx_buffer)
@@ -193,8 +197,10 @@ impl<'d, T: Instance> UarteTx<'d, T> {
 }
 
 impl<'d, T: Instance> Write for UarteTx<'d, T> {
-    #[rustfmt::skip]
+    type WriteFuture<'a>
-    type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), TraitError>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), TraitError>> + 'a;
 
     fn write<'a>(&'a mut self, tx_buffer: &'a [u8]) -> Self::WriteFuture<'a> {
         async move {
@@ -274,8 +280,10 @@ impl<'d, T: Instance> UarteRx<'d, T> {
 }
 
 impl<'d, T: Instance> Read for UarteRx<'d, T> {
-    #[rustfmt::skip]
+    type ReadFuture<'a>
-    type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), TraitError>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), TraitError>> + 'a;
 
     fn read<'a>(&'a mut self, rx_buffer: &'a mut [u8]) -> Self::ReadFuture<'a> {
         async move {
@@ -490,8 +498,10 @@ impl<'d, U: Instance, T: TimerInstance> UarteWithIdle<'d, U, T> {
 }
 
 impl<'d, U: Instance, T: TimerInstance> ReadUntilIdle for UarteWithIdle<'d, U, T> {
-    #[rustfmt::skip]
+    type ReadUntilIdleFuture<'a>
-    type ReadUntilIdleFuture<'a> where Self: 'a = impl Future<Output = Result<usize, TraitError>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<usize, TraitError>> + 'a;
     fn read_until_idle<'a>(&'a mut self, rx_buffer: &'a mut [u8]) -> Self::ReadUntilIdleFuture<'a> {
         async move {
             let ptr = rx_buffer.as_ptr();
@@ -550,8 +560,10 @@ impl<'d, U: Instance, T: TimerInstance> ReadUntilIdle for UarteWithIdle<'d, U, T
 }
 
 impl<'d, U: Instance, T: TimerInstance> Read for UarteWithIdle<'d, U, T> {
-    #[rustfmt::skip]
+    type ReadFuture<'a>
-    type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), TraitError>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), TraitError>> + 'a;
     fn read<'a>(&'a mut self, rx_buffer: &'a mut [u8]) -> Self::ReadFuture<'a> {
         async move {
             self.ppi_ch1.disable();
@@ -563,8 +575,10 @@ impl<'d, U: Instance, T: TimerInstance> Read for UarteWithIdle<'d, U, T> {
 }
 
 impl<'d, U: Instance, T: TimerInstance> Write for UarteWithIdle<'d, U, T> {
-    #[rustfmt::skip]
+    type WriteFuture<'a>
-    type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), TraitError>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), TraitError>> + 'a;
 
     fn write<'a>(&'a mut self, tx_buffer: &'a [u8]) -> Self::WriteFuture<'a> {
         self.uarte.write(tx_buffer)

embassy-stm32/src/i2c/v2.rs

@@ -858,12 +858,27 @@ impl<'d, T: Instance, TXDMA: super::TxDma<T>, RXDMA: super::RxDma<T>> I2cTrait<u
 {
     type Error = super::Error;
 
-    #[rustfmt::skip]
+    type WriteFuture<'a>
-    type WriteFuture<'a> where 'd: 'a, T: 'a, TXDMA: 'a, RXDMA: 'a = impl Future<Output = Result<(), Self::Error>> + 'a;
+    where
-    #[rustfmt::skip]
+        'd: 'a,
-    type ReadFuture<'a> where 'd: 'a, T: 'a, TXDMA: 'a, RXDMA: 'a = impl Future<Output = Result<(), Self::Error>> + 'a;
+        T: 'a,
-    #[rustfmt::skip]
+        TXDMA: 'a,
-    type WriteReadFuture<'a> where 'd: 'a, T: 'a, TXDMA: 'a, RXDMA: 'a = impl Future<Output = Result<(), Self::Error>> + 'a;
+        RXDMA: 'a,
+    = impl Future<Output = Result<(), Self::Error>> + 'a;
+    type ReadFuture<'a>
+    where
+        'd: 'a,
+        T: 'a,
+        TXDMA: 'a,
+        RXDMA: 'a,
+    = impl Future<Output = Result<(), Self::Error>> + 'a;
+    type WriteReadFuture<'a>
+    where
+        'd: 'a,
+        T: 'a,
+        TXDMA: 'a,
+        RXDMA: 'a,
+    = impl Future<Output = Result<(), Self::Error>> + 'a;
 
     fn read<'a>(&'a mut self, address: u8, buffer: &'a mut [u8]) -> Self::ReadFuture<'a> {
         self.read_dma(address, buffer, false)

embassy-stm32/src/rng.rs

@@ -85,8 +85,10 @@ impl<T: Instance> CryptoRng for Rng<T> {}
 
 impl<T: Instance> traits::rng::Rng for Rng<T> {
     type Error = Error;
-    #[rustfmt::skip]
+    type RngFuture<'a>
-    type RngFuture<'a> where Self: 'a = impl Future<Output=Result<(), Self::Error>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), Self::Error>> + 'a;
 
     fn fill_bytes<'a>(&'a mut self, dest: &'a mut [u8]) -> Self::RngFuture<'a> {
         unsafe {

embassy-stm32/src/sdmmc/v2.rs

@@ -1545,10 +1545,14 @@ mod sdmmc_rs {
 
     impl<'d, T: Instance, P: Pins<T>> BlockDevice for Sdmmc<'d, T, P> {
         type Error = Error;
-        #[rustfmt::skip]
+        type ReadFuture<'a>
-        type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), Self::Error>> + 'a;
+        where
-        #[rustfmt::skip]
+            Self: 'a,
-        type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), Self::Error>> + 'a;
+        = impl Future<Output = Result<(), Self::Error>> + 'a;
+        type WriteFuture<'a>
+        where
+            Self: 'a,
+        = impl Future<Output = Result<(), Self::Error>> + 'a;
 
         fn read<'a>(
             &'a mut self,

embassy-stm32/src/spi/mod.rs

@@ -545,8 +545,10 @@ impl<'d, T: Instance, Tx, Rx> traits::Spi<u8> for Spi<'d, T, Tx, Rx> {
 }
 
 impl<'d, T: Instance, Tx: TxDmaChannel<T>, Rx> traits::Write<u8> for Spi<'d, T, Tx, Rx> {
-    #[rustfmt::skip]
+    type WriteFuture<'a>
-    type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), Self::Error>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), Self::Error>> + 'a;
 
     fn write<'a>(&'a mut self, data: &'a [u8]) -> Self::WriteFuture<'a> {
         self.write_dma_u8(data)
@@ -556,8 +558,10 @@ impl<'d, T: Instance, Tx: TxDmaChannel<T>, Rx> traits::Write<u8> for Spi<'d, T,
 impl<'d, T: Instance, Tx: TxDmaChannel<T>, Rx: RxDmaChannel<T>> traits::Read<u8>
     for Spi<'d, T, Tx, Rx>
 {
-    #[rustfmt::skip]
+    type ReadFuture<'a>
-    type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), Self::Error>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), Self::Error>> + 'a;
 
     fn read<'a>(&'a mut self, data: &'a mut [u8]) -> Self::ReadFuture<'a> {
         self.read_dma_u8(data)
@@ -567,8 +571,10 @@ impl<'d, T: Instance, Tx: TxDmaChannel<T>, Rx: RxDmaChannel<T>> traits::Read<u8>
 impl<'d, T: Instance, Tx: TxDmaChannel<T>, Rx: RxDmaChannel<T>> traits::FullDuplex<u8>
     for Spi<'d, T, Tx, Rx>
 {
-    #[rustfmt::skip]
+    type WriteReadFuture<'a>
-    type WriteReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), Self::Error>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), Self::Error>> + 'a;
 
     fn read_write<'a>(
         &'a mut self,

embassy-stm32/src/usart/mod.rs

@@ -219,8 +219,10 @@ impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T,
 where
     TxDma: crate::usart::TxDma<T>,
 {
-    #[rustfmt::skip]
+    type WriteFuture<'a>
-    type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), embassy_traits::uart::Error>> + 'a;
 
     fn write<'a>(&'a mut self, buf: &'a [u8]) -> Self::WriteFuture<'a> {
         self.write_dma(buf)
@@ -232,8 +234,10 @@ impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Read for Uart<'d, T, T
 where
     RxDma: crate::usart::RxDma<T>,
 {
-    #[rustfmt::skip]
+    type ReadFuture<'a>
-    type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>> + 'a;
+    where
+        Self: 'a,
+    = impl Future<Output = Result<(), embassy_traits::uart::Error>> + 'a;
 
     fn read<'a>(&'a mut self, buf: &'a mut [u8]) -> Self::ReadFuture<'a> {
         self.read_dma(buf)

embassy-traits/src/rng.rs

@@ -4,10 +4,9 @@ use core::future::Future;
 pub trait Rng {
     type Error;
 
-    #[rustfmt::skip]
+    type RngFuture<'a>: Future<Output = Result<(), Self::Error>> + 'a
-    type RngFuture<'a>: Future<Output = Result<(), Self::Error> > + 'a
     where
-    Self: 'a;
+        Self: 'a;
 
     /// Completely fill the provided buffer with random bytes.
     ///