Skip to content

Commit

Permalink
Fix nightly warnings (#2082)
Browse files Browse the repository at this point in the history
  • Loading branch information
bugadani authored Sep 5, 2024
1 parent 80c0a81 commit 42a0417
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion esp-hal/src/aes/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ pub mod dma {
mode: Mode,
cipher_mode: CipherMode,
key: K,
) -> Result<DmaTransferTxRx<'_, Self>, crate::dma::DmaError>
) -> Result<DmaTransferTxRx<'t, Self>, crate::dma::DmaError>
where
K: Into<Key>,
TXBUF: ReadBuffer,
Expand Down
16 changes: 8 additions & 8 deletions esp-hal/src/i2s.rs
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ where
/// Write I2S.
/// Returns [DmaTransferTx] which represents the in-progress DMA
/// transfer
fn write_dma<'t>(&'t mut self, words: &'t TXBUF) -> Result<DmaTransferTx<'_, Self>, Error>
fn write_dma<'t>(&'t mut self, words: &'t TXBUF) -> Result<DmaTransferTx<'t, Self>, Error>
where
TXBUF: ReadBuffer;

Expand All @@ -281,7 +281,7 @@ where
fn write_dma_circular<'t>(
&'t mut self,
words: &'t TXBUF,
) -> Result<DmaTransferTxCircular<'_, Self>, Error>
) -> Result<DmaTransferTxCircular<'t, Self>, Error>
where
TXBUF: ReadBuffer;
}
Expand All @@ -304,7 +304,7 @@ where
/// Read I2S.
/// Returns [DmaTransferRx] which represents the in-progress DMA
/// transfer
fn read_dma<'t>(&'t mut self, words: &'t mut RXBUF) -> Result<DmaTransferRx<'_, Self>, Error>
fn read_dma<'t>(&'t mut self, words: &'t mut RXBUF) -> Result<DmaTransferRx<'t, Self>, Error>
where
RXBUF: WriteBuffer;

Expand All @@ -314,7 +314,7 @@ where
fn read_dma_circular<'t>(
&'t mut self,
words: &'t mut RXBUF,
) -> Result<DmaTransferRxCircular<'_, Self>, Error>
) -> Result<DmaTransferRxCircular<'t, Self>, Error>
where
RXBUF: WriteBuffer;
}
Expand Down Expand Up @@ -663,7 +663,7 @@ where
CH: DmaChannel,
DmaMode: Mode,
{
fn write_dma<'t>(&'t mut self, words: &'t TXBUF) -> Result<DmaTransferTx<'_, Self>, Error>
fn write_dma<'t>(&'t mut self, words: &'t TXBUF) -> Result<DmaTransferTx<'t, Self>, Error>
where
TXBUF: ReadBuffer,
{
Expand All @@ -674,7 +674,7 @@ where
fn write_dma_circular<'t>(
&'t mut self,
words: &'t TXBUF,
) -> Result<DmaTransferTxCircular<'_, Self>, Error>
) -> Result<DmaTransferTxCircular<'t, Self>, Error>
where
TXBUF: ReadBuffer,
{
Expand Down Expand Up @@ -844,7 +844,7 @@ where
DmaMode: Mode,
Self: DmaSupportRx + Sized,
{
fn read_dma<'t>(&'t mut self, words: &'t mut RXBUF) -> Result<DmaTransferRx<'_, Self>, Error>
fn read_dma<'t>(&'t mut self, words: &'t mut RXBUF) -> Result<DmaTransferRx<'t, Self>, Error>
where
RXBUF: WriteBuffer,
{
Expand All @@ -855,7 +855,7 @@ where
fn read_dma_circular<'t>(
&'t mut self,
words: &'t mut RXBUF,
) -> Result<DmaTransferRxCircular<'_, Self>, Error>
) -> Result<DmaTransferRxCircular<'t, Self>, Error>
where
RXBUF: WriteBuffer,
{
Expand Down
4 changes: 2 additions & 2 deletions esp-hal/src/parl_io.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1430,7 +1430,7 @@ where
pub fn write_dma<'t, TXBUF>(
&'t mut self,
words: &'t TXBUF,
) -> Result<DmaTransferTx<'_, Self>, Error>
) -> Result<DmaTransferTx<'t, Self>, Error>
where
TXBUF: ReadBuffer,
{
Expand Down Expand Up @@ -1526,7 +1526,7 @@ where
pub fn read_dma<'t, RXBUF>(
&'t mut self,
words: &'t mut RXBUF,
) -> Result<DmaTransferRx<'_, Self>, Error>
) -> Result<DmaTransferRx<'t, Self>, Error>
where
RXBUF: WriteBuffer,
{
Expand Down
6 changes: 3 additions & 3 deletions esp-hal/src/spi/slave.rs
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ pub mod dma {
pub fn dma_write<'t, TXBUF>(
&'t mut self,
words: &'t TXBUF,
) -> Result<DmaTransferTx<'_, Self>, Error>
) -> Result<DmaTransferTx<'t, Self>, Error>
where
TXBUF: ReadBuffer,
{
Expand All @@ -382,7 +382,7 @@ pub mod dma {
pub fn dma_read<'t, RXBUF>(
&'t mut self,
words: &'t mut RXBUF,
) -> Result<DmaTransferRx<'_, Self>, Error>
) -> Result<DmaTransferRx<'t, Self>, Error>
where
RXBUF: WriteBuffer,
{
Expand Down Expand Up @@ -410,7 +410,7 @@ pub mod dma {
&'t mut self,
words: &'t TXBUF,
read_buffer: &'t mut RXBUF,
) -> Result<DmaTransferTxRx<'_, Self>, Error>
) -> Result<DmaTransferTxRx<'t, Self>, Error>
where
TXBUF: ReadBuffer,
RXBUF: WriteBuffer,
Expand Down

0 comments on commit 42a0417

Please sign in to comment.