From 2bbd1ddb8a0e36e91a2b328024f313b780b1b851 Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Thu, 16 Dec 2021 11:37:53 +0100 Subject: [PATCH] Remove unneeded rustfmt::skip --- embassy-lora/src/sx127x/mod.rs | 22 ++++++++++++++---- embassy-nrf/src/gpio.rs | 36 +++++++++++++++++++---------- embassy-nrf/src/qspi.rs | 18 ++++++++++----- embassy-nrf/src/rng.rs | 6 +++-- embassy-nrf/src/spim.rs | 18 ++++++++++----- embassy-nrf/src/twim.rs | 18 ++++++++++----- embassy-nrf/src/uarte.rs | 42 ++++++++++++++++++++++------------ embassy-stm32/src/i2c/v2.rs | 27 +++++++++++++++++----- embassy-stm32/src/rng.rs | 6 +++-- embassy-stm32/src/sdmmc/v2.rs | 12 ++++++---- embassy-stm32/src/spi/mod.rs | 18 ++++++++++----- embassy-stm32/src/usart/mod.rs | 12 ++++++---- embassy-traits/src/rng.rs | 5 ++-- 13 files changed, 165 insertions(+), 75 deletions(-) diff --git a/embassy-lora/src/sx127x/mod.rs b/embassy-lora/src/sx127x/mod.rs index 7d3280e0..c26628b0 100644 --- a/embassy-lora/src/sx127x/mod.rs +++ b/embassy-lora/src/sx127x/mod.rs @@ -89,8 +89,15 @@ where { type PhyError = Sx127xError; - #[rustfmt::skip] - type TxFuture<'m> where SPI: 'm, CS: 'm, RESET: 'm, E: 'm, I: 'm, RFS: 'm = impl Future> + 'm; + type TxFuture<'m> + where + SPI: 'm, + CS: 'm, + RESET: 'm, + E: 'm, + I: 'm, + RFS: 'm, + = impl Future> + '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> where SPI: 'm, CS: 'm, RESET: 'm, E: 'm, I: 'm, RFS: 'm = impl Future> + 'm; + type RxFuture<'m> + where + SPI: 'm, + CS: 'm, + RESET: 'm, + E: 'm, + I: 'm, + RFS: 'm, + = impl Future> + 'm; fn rx<'m>(&'m mut self, config: RfConfig, buf: &'m mut [u8]) -> Self::RxFuture<'m> { trace!("RX START"); diff --git a/embassy-nrf/src/gpio.rs b/embassy-nrf/src/gpio.rs index 190d8470..cb06f097 100644 --- a/embassy-nrf/src/gpio.rs +++ b/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> where Self: 'a = impl Future + Unpin + 'a; + type Future<'a> + where + Self: 'a, + = impl Future + 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> where Self: 'a = impl Future + Unpin + 'a; + type Future<'a> + where + Self: 'a, + = impl Future + 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> where Self: 'a = impl Future + Unpin + 'a; + type Future<'a> + where + Self: 'a, + = impl Future + 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> where Self: 'a = impl Future + Unpin + 'a; + type Future<'a> + where + Self: 'a, + = impl Future + 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> where Self: 'a = impl Future + Unpin + 'a; + type Future<'a> + where + Self: 'a, + = impl Future + 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> where Self: 'a = impl Future + Unpin + 'a; + type Future<'a> + where + Self: 'a, + = impl Future + Unpin + 'a; fn wait_for_any_edge<'a>(&'a mut self) -> Self::Future<'a> { if self.is_high().ok().unwrap() { diff --git a/embassy-nrf/src/qspi.rs b/embassy-nrf/src/qspi.rs index e8709425..56a757c0 100644 --- a/embassy-nrf/src/qspi.rs +++ b/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> where Self: 'a = impl Future> + 'a; - #[rustfmt::skip] - type WriteFuture<'a> where Self: 'a = impl Future> + 'a; - #[rustfmt::skip] - type ErasePageFuture<'a> where Self: 'a = impl Future> + 'a; + type ReadFuture<'a> + where + Self: 'a, + = impl Future> + 'a; + type WriteFuture<'a> + where + Self: 'a, + = impl Future> + 'a; + type ErasePageFuture<'a> + where + Self: 'a, + = impl Future> + 'a; fn read<'a>(&'a mut self, address: usize, data: &'a mut [u8]) -> Self::ReadFuture<'a> { async move { diff --git a/embassy-nrf/src/rng.rs b/embassy-nrf/src/rng.rs index 20d033a1..645f9860 100644 --- a/embassy-nrf/src/rng.rs +++ b/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> where 'd: 'a = impl Future> + 'a; + type RngFuture<'a> + where + 'd: 'a, + = impl Future> + 'a; fn fill_bytes<'a>(&'a mut self, dest: &'a mut [u8]) -> Self::RngFuture<'a> { async move { diff --git a/embassy-nrf/src/spim.rs b/embassy-nrf/src/spim.rs index e88fb460..c72c4c5b 100644 --- a/embassy-nrf/src/spim.rs +++ b/embassy-nrf/src/spim.rs @@ -182,8 +182,10 @@ impl<'d, T: Instance> Spi for Spim<'d, T> { } impl<'d, T: Instance> Read for Spim<'d, T> { - #[rustfmt::skip] - type ReadFuture<'a> where Self: 'a = impl Future> + 'a; + type ReadFuture<'a> + where + Self: 'a, + = impl Future> + '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 for Spim<'d, T> { } impl<'d, T: Instance> Write for Spim<'d, T> { - #[rustfmt::skip] - type WriteFuture<'a> where Self: 'a = impl Future> + 'a; + type WriteFuture<'a> + where + Self: 'a, + = impl Future> + '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 for Spim<'d, T> { } impl<'d, T: Instance> FullDuplex for Spim<'d, T> { - #[rustfmt::skip] - type WriteReadFuture<'a> where Self: 'a = impl Future> + 'a; + type WriteReadFuture<'a> + where + Self: 'a, + = impl Future> + 'a; fn read_write<'a>(&'a mut self, rx: &'a mut [u8], tx: &'a [u8]) -> Self::WriteReadFuture<'a> { async move { diff --git a/embassy-nrf/src/twim.rs b/embassy-nrf/src/twim.rs index 8173f66b..d42b88d3 100644 --- a/embassy-nrf/src/twim.rs +++ b/embassy-nrf/src/twim.rs @@ -469,12 +469,18 @@ where { type Error = Error; - #[rustfmt::skip] - type WriteFuture<'a> where Self: 'a = impl Future> + 'a; - #[rustfmt::skip] - type ReadFuture<'a> where Self: 'a = impl Future> + 'a; - #[rustfmt::skip] - type WriteReadFuture<'a> where Self: 'a = impl Future> + 'a; + type WriteFuture<'a> + where + Self: 'a, + = impl Future> + 'a; + type ReadFuture<'a> + where + Self: 'a, + = impl Future> + 'a; + type WriteReadFuture<'a> + where + Self: 'a, + = impl Future> + 'a; fn read<'a>(&'a mut self, address: u8, buffer: &'a mut [u8]) -> Self::ReadFuture<'a> { async move { diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs index 17417c0e..77794819 100644 --- a/embassy-nrf/src/uarte.rs +++ b/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> where Self: 'a = impl Future> + 'a; + type ReadFuture<'a> + where + Self: 'a, + = impl Future> + '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> where Self: 'a = impl Future> + 'a; + type WriteFuture<'a> + where + Self: 'a, + = impl Future> + '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> where Self: 'a = impl Future> + 'a; + type WriteFuture<'a> + where + Self: 'a, + = impl Future> + '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> where Self: 'a = impl Future> + 'a; + type ReadFuture<'a> + where + Self: 'a, + = impl Future> + '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> where Self: 'a = impl Future> + 'a; + type ReadUntilIdleFuture<'a> + where + Self: 'a, + = impl Future> + '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> where Self: 'a = impl Future> + 'a; + type ReadFuture<'a> + where + Self: 'a, + = impl Future> + '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> where Self: 'a = impl Future> + 'a; + type WriteFuture<'a> + where + Self: 'a, + = impl Future> + 'a; fn write<'a>(&'a mut self, tx_buffer: &'a [u8]) -> Self::WriteFuture<'a> { self.uarte.write(tx_buffer) diff --git a/embassy-stm32/src/i2c/v2.rs b/embassy-stm32/src/i2c/v2.rs index 94c4d9a7..73b6f551 100644 --- a/embassy-stm32/src/i2c/v2.rs +++ b/embassy-stm32/src/i2c/v2.rs @@ -858,12 +858,27 @@ impl<'d, T: Instance, TXDMA: super::TxDma, RXDMA: super::RxDma> I2cTrait where 'd: 'a, T: 'a, TXDMA: 'a, RXDMA: 'a = impl Future> + 'a; - #[rustfmt::skip] - type ReadFuture<'a> where 'd: 'a, T: 'a, TXDMA: 'a, RXDMA: 'a = impl Future> + 'a; - #[rustfmt::skip] - type WriteReadFuture<'a> where 'd: 'a, T: 'a, TXDMA: 'a, RXDMA: 'a = impl Future> + 'a; + type WriteFuture<'a> + where + 'd: 'a, + T: 'a, + TXDMA: 'a, + RXDMA: 'a, + = impl Future> + 'a; + type ReadFuture<'a> + where + 'd: 'a, + T: 'a, + TXDMA: 'a, + RXDMA: 'a, + = impl Future> + 'a; + type WriteReadFuture<'a> + where + 'd: 'a, + T: 'a, + TXDMA: 'a, + RXDMA: 'a, + = impl Future> + 'a; fn read<'a>(&'a mut self, address: u8, buffer: &'a mut [u8]) -> Self::ReadFuture<'a> { self.read_dma(address, buffer, false) diff --git a/embassy-stm32/src/rng.rs b/embassy-stm32/src/rng.rs index 5655ed96..dd059eda 100644 --- a/embassy-stm32/src/rng.rs +++ b/embassy-stm32/src/rng.rs @@ -85,8 +85,10 @@ impl CryptoRng for Rng {} impl traits::rng::Rng for Rng { type Error = Error; - #[rustfmt::skip] - type RngFuture<'a> where Self: 'a = impl Future> + 'a; + type RngFuture<'a> + where + Self: 'a, + = impl Future> + 'a; fn fill_bytes<'a>(&'a mut self, dest: &'a mut [u8]) -> Self::RngFuture<'a> { unsafe { diff --git a/embassy-stm32/src/sdmmc/v2.rs b/embassy-stm32/src/sdmmc/v2.rs index 6032c2bb..5914f92f 100644 --- a/embassy-stm32/src/sdmmc/v2.rs +++ b/embassy-stm32/src/sdmmc/v2.rs @@ -1545,10 +1545,14 @@ mod sdmmc_rs { impl<'d, T: Instance, P: Pins> BlockDevice for Sdmmc<'d, T, P> { type Error = Error; - #[rustfmt::skip] - type ReadFuture<'a> where Self: 'a = impl Future> + 'a; - #[rustfmt::skip] - type WriteFuture<'a> where Self: 'a = impl Future> + 'a; + type ReadFuture<'a> + where + Self: 'a, + = impl Future> + 'a; + type WriteFuture<'a> + where + Self: 'a, + = impl Future> + 'a; fn read<'a>( &'a mut self, diff --git a/embassy-stm32/src/spi/mod.rs b/embassy-stm32/src/spi/mod.rs index e74b2e15..4ae45a9b 100644 --- a/embassy-stm32/src/spi/mod.rs +++ b/embassy-stm32/src/spi/mod.rs @@ -545,8 +545,10 @@ impl<'d, T: Instance, Tx, Rx> traits::Spi for Spi<'d, T, Tx, Rx> { } impl<'d, T: Instance, Tx: TxDmaChannel, Rx> traits::Write for Spi<'d, T, Tx, Rx> { - #[rustfmt::skip] - type WriteFuture<'a> where Self: 'a = impl Future> + 'a; + type WriteFuture<'a> + where + Self: 'a, + = impl Future> + '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, Rx> traits::Write for Spi<'d, T, impl<'d, T: Instance, Tx: TxDmaChannel, Rx: RxDmaChannel> traits::Read for Spi<'d, T, Tx, Rx> { - #[rustfmt::skip] - type ReadFuture<'a> where Self: 'a = impl Future> + 'a; + type ReadFuture<'a> + where + Self: 'a, + = impl Future> + '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, Rx: RxDmaChannel> traits::Read impl<'d, T: Instance, Tx: TxDmaChannel, Rx: RxDmaChannel> traits::FullDuplex for Spi<'d, T, Tx, Rx> { - #[rustfmt::skip] - type WriteReadFuture<'a> where Self: 'a = impl Future> + 'a; + type WriteReadFuture<'a> + where + Self: 'a, + = impl Future> + 'a; fn read_write<'a>( &'a mut self, diff --git a/embassy-stm32/src/usart/mod.rs b/embassy-stm32/src/usart/mod.rs index a87b7c02..b51a728c 100644 --- a/embassy-stm32/src/usart/mod.rs +++ b/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, { - #[rustfmt::skip] - type WriteFuture<'a> where Self: 'a = impl Future> + 'a; + type WriteFuture<'a> + where + Self: 'a, + = impl Future> + '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, { - #[rustfmt::skip] - type ReadFuture<'a> where Self: 'a = impl Future> + 'a; + type ReadFuture<'a> + where + Self: 'a, + = impl Future> + 'a; fn read<'a>(&'a mut self, buf: &'a mut [u8]) -> Self::ReadFuture<'a> { self.read_dma(buf) diff --git a/embassy-traits/src/rng.rs b/embassy-traits/src/rng.rs index ac4463ee..ec97406b 100644 --- a/embassy-traits/src/rng.rs +++ b/embassy-traits/src/rng.rs @@ -4,10 +4,9 @@ use core::future::Future; pub trait Rng { type Error; - #[rustfmt::skip] - type RngFuture<'a>: Future > + 'a + type RngFuture<'a>: Future> + 'a where - Self: 'a; + Self: 'a; /// Completely fill the provided buffer with random bytes. ///