aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--embassy-stm32/src/dma/bdma.rs4
-rw-r--r--embassy-stm32/src/dma/dma.rs4
-rw-r--r--embassy-stm32/src/rng.rs2
-rw-r--r--embassy-stm32/src/usart/v1.rs4
-rw-r--r--embassy-stm32/src/usart/v2.rs4
5 files changed, 9 insertions, 9 deletions
diff --git a/embassy-stm32/src/dma/bdma.rs b/embassy-stm32/src/dma/bdma.rs
index 2aa00ebee..d262caeb6 100644
--- a/embassy-stm32/src/dma/bdma.rs
+++ b/embassy-stm32/src/dma/bdma.rs
@@ -159,8 +159,8 @@ pac::dma_channels! {
159 impl crate::dma::sealed::Channel for crate::peripherals::$channel_peri {} 159 impl crate::dma::sealed::Channel for crate::peripherals::$channel_peri {}
160 impl Channel for crate::peripherals::$channel_peri 160 impl Channel for crate::peripherals::$channel_peri
161 { 161 {
162 type ReadFuture<'a> = impl Future<Output = ()>; 162 type ReadFuture<'a> = impl Future<Output = ()> + 'a;
163 type WriteFuture<'a> = impl Future<Output = ()>; 163 type WriteFuture<'a> = impl Future<Output = ()> + 'a;
164 164
165 fn read<'a>( 165 fn read<'a>(
166 &'a mut self, 166 &'a mut self,
diff --git a/embassy-stm32/src/dma/dma.rs b/embassy-stm32/src/dma/dma.rs
index 47120c39d..9bf083de4 100644
--- a/embassy-stm32/src/dma/dma.rs
+++ b/embassy-stm32/src/dma/dma.rs
@@ -165,8 +165,8 @@ pac::dma_channels! {
165 impl crate::dma::sealed::Channel for crate::peripherals::$channel_peri {} 165 impl crate::dma::sealed::Channel for crate::peripherals::$channel_peri {}
166 impl Channel for crate::peripherals::$channel_peri 166 impl Channel for crate::peripherals::$channel_peri
167 { 167 {
168 type ReadFuture<'a> = impl Future<Output = ()>; 168 type ReadFuture<'a> = impl Future<Output = ()> + 'a;
169 type WriteFuture<'a> = impl Future<Output = ()>; 169 type WriteFuture<'a> = impl Future<Output = ()> + 'a;
170 170
171 fn read<'a>( 171 fn read<'a>(
172 &'a mut self, 172 &'a mut self,
diff --git a/embassy-stm32/src/rng.rs b/embassy-stm32/src/rng.rs
index d93a25f5a..a56fba19b 100644
--- a/embassy-stm32/src/rng.rs
+++ b/embassy-stm32/src/rng.rs
@@ -84,7 +84,7 @@ impl<T: Instance> CryptoRng for Random<T> {}
84impl<T: Instance> traits::rng::Rng for Random<T> { 84impl<T: Instance> traits::rng::Rng for Random<T> {
85 type Error = Error; 85 type Error = Error;
86 #[rustfmt::skip] 86 #[rustfmt::skip]
87 type RngFuture<'a> where Self: 'a = impl Future<Output=Result<(), Self::Error>>; 87 type RngFuture<'a> where Self: 'a = impl Future<Output=Result<(), Self::Error>> + 'a;
88 88
89 fn fill_bytes<'a>(&'a mut self, dest: &'a mut [u8]) -> Self::RngFuture<'a> { 89 fn fill_bytes<'a>(&'a mut self, dest: &'a mut [u8]) -> Self::RngFuture<'a> {
90 unsafe { 90 unsafe {
diff --git a/embassy-stm32/src/usart/v1.rs b/embassy-stm32/src/usart/v1.rs
index 9e9b49306..ec6677699 100644
--- a/embassy-stm32/src/usart/v1.rs
+++ b/embassy-stm32/src/usart/v1.rs
@@ -153,7 +153,7 @@ impl<'d, T: Instance, RxDma> embedded_hal::blocking::serial::Write<u8>
153impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T, TxDma, RxDma> 153impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T, TxDma, RxDma>
154 where TxDma: crate::usart::TxDma<T> 154 where TxDma: crate::usart::TxDma<T>
155{ 155{
156 type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>>; 156 type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>> + 'a;
157 157
158 fn write<'a>(&'a mut self, buf: &'a [u8]) -> Self::WriteFuture<'a> { 158 fn write<'a>(&'a mut self, buf: &'a [u8]) -> Self::WriteFuture<'a> {
159 self.write_dma(buf).map_err(|_| embassy_traits::uart::Error::Other) 159 self.write_dma(buf).map_err(|_| embassy_traits::uart::Error::Other)
@@ -165,7 +165,7 @@ impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T,
165impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Read for Uart<'d, T, TxDma, RxDma> 165impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Read for Uart<'d, T, TxDma, RxDma>
166 where RxDma: crate::usart::RxDma<T> 166 where RxDma: crate::usart::RxDma<T>
167{ 167{
168 type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>>; 168 type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>> + 'a;
169 169
170 fn read<'a>(&'a mut self, buf: &'a mut [u8]) -> Self::ReadFuture<'a> { 170 fn read<'a>(&'a mut self, buf: &'a mut [u8]) -> Self::ReadFuture<'a> {
171 self.read_dma(buf).map_err(|_| embassy_traits::uart::Error::Other) 171 self.read_dma(buf).map_err(|_| embassy_traits::uart::Error::Other)
diff --git a/embassy-stm32/src/usart/v2.rs b/embassy-stm32/src/usart/v2.rs
index 694b16185..50996dbbf 100644
--- a/embassy-stm32/src/usart/v2.rs
+++ b/embassy-stm32/src/usart/v2.rs
@@ -157,7 +157,7 @@ impl<'d, T: Instance, RxDma> embedded_hal::blocking::serial::Write<u8>
157impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T, TxDma, RxDma> 157impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T, TxDma, RxDma>
158 where TxDma: crate::usart::TxDma<T> 158 where TxDma: crate::usart::TxDma<T>
159{ 159{
160 type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>>; 160 type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>> + 'a;
161 161
162 fn write<'a>(&'a mut self, buf: &'a [u8]) -> Self::WriteFuture<'a> { 162 fn write<'a>(&'a mut self, buf: &'a [u8]) -> Self::WriteFuture<'a> {
163 self.write_dma(buf).map_err(|_| embassy_traits::uart::Error::Other) 163 self.write_dma(buf).map_err(|_| embassy_traits::uart::Error::Other)
@@ -169,7 +169,7 @@ impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T,
169impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Read for Uart<'d, T, TxDma, RxDma> 169impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Read for Uart<'d, T, TxDma, RxDma>
170 where RxDma: crate::usart::RxDma<T> 170 where RxDma: crate::usart::RxDma<T>
171{ 171{
172 type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>>; 172 type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>> + 'a;
173 173
174 fn read<'a>(&'a mut self, buf: &'a mut [u8]) -> Self::ReadFuture<'a> { 174 fn read<'a>(&'a mut self, buf: &'a mut [u8]) -> Self::ReadFuture<'a> {
175 self.read_dma(buf).map_err(|_| embassy_traits::uart::Error::Other) 175 self.read_dma(buf).map_err(|_| embassy_traits::uart::Error::Other)