NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

stm32: add missing + 'a bounds on trait GATs

Browse source
This commit is contained in:
Dario Nieuwenhuis 2021-08-04 19:39:54 +02:00
parent 250f1cd0a5
commit 9bd34429f3
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
embassy-stm32/src/dma/bdma.rs
View file

@ -159,8 +159,8 @@ pac::dma_channels! {
impl crate::dma::sealed::Channel for crate::peripherals::$channel_peri {} impl crate::dma::sealed::Channel for crate::peripherals::$channel_peri {}
impl Channel for crate::peripherals::$channel_peri impl Channel for crate::peripherals::$channel_peri
{ {
type ReadFuture<'a> = impl Future<Output = ()>; type ReadFuture<'a> = impl Future<Output = ()> + 'a;
type WriteFuture<'a> = impl Future<Output = ()>; type WriteFuture<'a> = impl Future<Output = ()> + 'a;
fn read<'a>( fn read<'a>(
&'a mut self, &'a mut self,

4
embassy-stm32/src/dma/dma.rs
View file

@ -165,8 +165,8 @@ pac::dma_channels! {
impl crate::dma::sealed::Channel for crate::peripherals::$channel_peri {} impl crate::dma::sealed::Channel for crate::peripherals::$channel_peri {}
impl Channel for crate::peripherals::$channel_peri impl Channel for crate::peripherals::$channel_peri
{ {
type ReadFuture<'a> = impl Future<Output = ()>; type ReadFuture<'a> = impl Future<Output = ()> + 'a;
type WriteFuture<'a> = impl Future<Output = ()>; type WriteFuture<'a> = impl Future<Output = ()> + 'a;
fn read<'a>( fn read<'a>(
&'a mut self, &'a mut self,

2
embassy-stm32/src/rng.rs
View file

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

4
embassy-stm32/src/usart/v1.rs
View file

@ -153,7 +153,7 @@ impl<'d, T: Instance, RxDma> embedded_hal::blocking::serial::Write<u8>
impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T, TxDma, RxDma> impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T, TxDma, RxDma>
where TxDma: crate::usart::TxDma<T> where TxDma: crate::usart::TxDma<T>
{ {
type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>>; type WriteFuture<'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> { fn write<'a>(&'a mut self, buf: &'a [u8]) -> Self::WriteFuture<'a> {
self.write_dma(buf).map_err(|_| embassy_traits::uart::Error::Other) 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,
impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Read for Uart<'d, T, TxDma, RxDma> impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Read for Uart<'d, T, TxDma, RxDma>
where RxDma: crate::usart::RxDma<T> where RxDma: crate::usart::RxDma<T>
{ {
type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>>; type ReadFuture<'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> { fn read<'a>(&'a mut self, buf: &'a mut [u8]) -> Self::ReadFuture<'a> {
self.read_dma(buf).map_err(|_| embassy_traits::uart::Error::Other) self.read_dma(buf).map_err(|_| embassy_traits::uart::Error::Other)

4
embassy-stm32/src/usart/v2.rs
View file

@ -157,7 +157,7 @@ impl<'d, T: Instance, RxDma> embedded_hal::blocking::serial::Write<u8>
impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T, TxDma, RxDma> impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Write for Uart<'d, T, TxDma, RxDma>
where TxDma: crate::usart::TxDma<T> where TxDma: crate::usart::TxDma<T>
{ {
type WriteFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>>; type WriteFuture<'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> { fn write<'a>(&'a mut self, buf: &'a [u8]) -> Self::WriteFuture<'a> {
self.write_dma(buf).map_err(|_| embassy_traits::uart::Error::Other) 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,
impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Read for Uart<'d, T, TxDma, RxDma> impl<'d, T: Instance, TxDma, RxDma> embassy_traits::uart::Read for Uart<'d, T, TxDma, RxDma>
where RxDma: crate::usart::RxDma<T> where RxDma: crate::usart::RxDma<T>
{ {
type ReadFuture<'a> where Self: 'a = impl Future<Output = Result<(), embassy_traits::uart::Error>>; type ReadFuture<'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> { fn read<'a>(&'a mut self, buf: &'a mut [u8]) -> Self::ReadFuture<'a> {
self.read_dma(buf).map_err(|_| embassy_traits::uart::Error::Other) self.read_dma(buf).map_err(|_| embassy_traits::uart::Error::Other)