diff options
| author | Dario Nieuwenhuis <[email protected]> | 2024-10-14 00:12:45 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2024-10-14 00:12:45 +0200 |
| commit | 9a45d776d870582cda3db0db233e3f5aea15d34e (patch) | |
| tree | 12f265a48ac95cef8c91b0fb2ce7443dd6328988 | |
| parent | ee669ee5c57851ade034beca7cfaf81825c4c21b (diff) | |
rustfmt for new nightly.
| -rw-r--r-- | embassy-net-driver-channel/src/lib.rs | 10 | ||||
| -rw-r--r-- | embassy-net-driver/src/lib.rs | 6 | ||||
| -rw-r--r-- | embassy-net-enc28j60/src/lib.rs | 6 | ||||
| -rw-r--r-- | embassy-net-tuntap/src/lib.rs | 10 | ||||
| -rw-r--r-- | embassy-net/src/driver_util.rs | 10 | ||||
| -rw-r--r-- | embassy-net/src/tcp.rs | 5 | ||||
| -rw-r--r-- | embassy-stm32-wpan/src/mac/driver.rs | 10 | ||||
| -rw-r--r-- | embassy-stm32/src/eth/mod.rs | 10 |
8 files changed, 52 insertions, 15 deletions
diff --git a/embassy-net-driver-channel/src/lib.rs b/embassy-net-driver-channel/src/lib.rs index 7ad4d449e..6390502a8 100644 --- a/embassy-net-driver-channel/src/lib.rs +++ b/embassy-net-driver-channel/src/lib.rs | |||
| @@ -326,8 +326,14 @@ pub struct Device<'d, const MTU: usize> { | |||
| 326 | } | 326 | } |
| 327 | 327 | ||
| 328 | impl<'d, const MTU: usize> embassy_net_driver::Driver for Device<'d, MTU> { | 328 | impl<'d, const MTU: usize> embassy_net_driver::Driver for Device<'d, MTU> { |
| 329 | type RxToken<'a> = RxToken<'a, MTU> where Self: 'a ; | 329 | type RxToken<'a> |
| 330 | type TxToken<'a> = TxToken<'a, MTU> where Self: 'a ; | 330 | = RxToken<'a, MTU> |
| 331 | where | ||
| 332 | Self: 'a; | ||
| 333 | type TxToken<'a> | ||
| 334 | = TxToken<'a, MTU> | ||
| 335 | where | ||
| 336 | Self: 'a; | ||
| 331 | 337 | ||
| 332 | fn receive(&mut self, cx: &mut Context) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> { | 338 | fn receive(&mut self, cx: &mut Context) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> { |
| 333 | if self.rx.poll_receive(cx).is_ready() && self.tx.poll_send(cx).is_ready() { | 339 | if self.rx.poll_receive(cx).is_ready() && self.tx.poll_send(cx).is_ready() { |
diff --git a/embassy-net-driver/src/lib.rs b/embassy-net-driver/src/lib.rs index 87f9f6ed1..4c847718d 100644 --- a/embassy-net-driver/src/lib.rs +++ b/embassy-net-driver/src/lib.rs | |||
| @@ -83,10 +83,12 @@ pub trait Driver { | |||
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | impl<T: ?Sized + Driver> Driver for &mut T { | 85 | impl<T: ?Sized + Driver> Driver for &mut T { |
| 86 | type RxToken<'a> = T::RxToken<'a> | 86 | type RxToken<'a> |
| 87 | = T::RxToken<'a> | ||
| 87 | where | 88 | where |
| 88 | Self: 'a; | 89 | Self: 'a; |
| 89 | type TxToken<'a> = T::TxToken<'a> | 90 | type TxToken<'a> |
| 91 | = T::TxToken<'a> | ||
| 90 | where | 92 | where |
| 91 | Self: 'a; | 93 | Self: 'a; |
| 92 | 94 | ||
diff --git a/embassy-net-enc28j60/src/lib.rs b/embassy-net-enc28j60/src/lib.rs index dda35f498..c1f32719a 100644 --- a/embassy-net-enc28j60/src/lib.rs +++ b/embassy-net-enc28j60/src/lib.rs | |||
| @@ -635,11 +635,13 @@ where | |||
| 635 | S: SpiDevice, | 635 | S: SpiDevice, |
| 636 | O: OutputPin, | 636 | O: OutputPin, |
| 637 | { | 637 | { |
| 638 | type RxToken<'a> = RxToken<'a> | 638 | type RxToken<'a> |
| 639 | = RxToken<'a> | ||
| 639 | where | 640 | where |
| 640 | Self: 'a; | 641 | Self: 'a; |
| 641 | 642 | ||
| 642 | type TxToken<'a> = TxToken<'a, S, O> | 643 | type TxToken<'a> |
| 644 | = TxToken<'a, S, O> | ||
| 643 | where | 645 | where |
| 644 | Self: 'a; | 646 | Self: 'a; |
| 645 | 647 | ||
diff --git a/embassy-net-tuntap/src/lib.rs b/embassy-net-tuntap/src/lib.rs index 56f55fba1..2ff23f462 100644 --- a/embassy-net-tuntap/src/lib.rs +++ b/embassy-net-tuntap/src/lib.rs | |||
| @@ -152,8 +152,14 @@ impl TunTapDevice { | |||
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | impl Driver for TunTapDevice { | 154 | impl Driver for TunTapDevice { |
| 155 | type RxToken<'a> = RxToken where Self: 'a; | 155 | type RxToken<'a> |
| 156 | type TxToken<'a> = TxToken<'a> where Self: 'a; | 156 | = RxToken |
| 157 | where | ||
| 158 | Self: 'a; | ||
| 159 | type TxToken<'a> | ||
| 160 | = TxToken<'a> | ||
| 161 | where | ||
| 162 | Self: 'a; | ||
| 157 | 163 | ||
| 158 | fn receive(&mut self, cx: &mut Context) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> { | 164 | fn receive(&mut self, cx: &mut Context) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> { |
| 159 | let mut buf = vec![0; self.device.get_ref().mtu]; | 165 | let mut buf = vec![0; self.device.get_ref().mtu]; |
diff --git a/embassy-net/src/driver_util.rs b/embassy-net/src/driver_util.rs index b2af1d499..f51641425 100644 --- a/embassy-net/src/driver_util.rs +++ b/embassy-net/src/driver_util.rs | |||
| @@ -18,8 +18,14 @@ impl<'d, 'c, T> phy::Device for DriverAdapter<'d, 'c, T> | |||
| 18 | where | 18 | where |
| 19 | T: Driver, | 19 | T: Driver, |
| 20 | { | 20 | { |
| 21 | type RxToken<'a> = RxTokenAdapter<T::RxToken<'a>> where Self: 'a; | 21 | type RxToken<'a> |
| 22 | type TxToken<'a> = TxTokenAdapter<T::TxToken<'a>> where Self: 'a; | 22 | = RxTokenAdapter<T::RxToken<'a>> |
| 23 | where | ||
| 24 | Self: 'a; | ||
| 25 | type TxToken<'a> | ||
| 26 | = TxTokenAdapter<T::TxToken<'a>> | ||
| 27 | where | ||
| 28 | Self: 'a; | ||
| 23 | 29 | ||
| 24 | fn receive(&mut self, _timestamp: Instant) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> { | 30 | fn receive(&mut self, _timestamp: Instant) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> { |
| 25 | self.inner | 31 | self.inner |
diff --git a/embassy-net/src/tcp.rs b/embassy-net/src/tcp.rs index 1bd582b65..043062e06 100644 --- a/embassy-net/src/tcp.rs +++ b/embassy-net/src/tcp.rs | |||
| @@ -712,7 +712,10 @@ pub mod client { | |||
| 712 | for TcpClient<'d, N, TX_SZ, RX_SZ> | 712 | for TcpClient<'d, N, TX_SZ, RX_SZ> |
| 713 | { | 713 | { |
| 714 | type Error = Error; | 714 | type Error = Error; |
| 715 | type Connection<'m> = TcpConnection<'m, N, TX_SZ, RX_SZ> where Self: 'm; | 715 | type Connection<'m> |
| 716 | = TcpConnection<'m, N, TX_SZ, RX_SZ> | ||
| 717 | where | ||
| 718 | Self: 'm; | ||
| 716 | 719 | ||
| 717 | async fn connect<'a>(&'a self, remote: core::net::SocketAddr) -> Result<Self::Connection<'a>, Self::Error> { | 720 | async fn connect<'a>(&'a self, remote: core::net::SocketAddr) -> Result<Self::Connection<'a>, Self::Error> { |
| 718 | let addr: crate::IpAddress = match remote.ip() { | 721 | let addr: crate::IpAddress = match remote.ip() { |
diff --git a/embassy-stm32-wpan/src/mac/driver.rs b/embassy-stm32-wpan/src/mac/driver.rs index 5b9d5daf4..41cca09e3 100644 --- a/embassy-stm32-wpan/src/mac/driver.rs +++ b/embassy-stm32-wpan/src/mac/driver.rs | |||
| @@ -23,8 +23,14 @@ impl<'d> Driver<'d> { | |||
| 23 | impl<'d> embassy_net_driver::Driver for Driver<'d> { | 23 | impl<'d> embassy_net_driver::Driver for Driver<'d> { |
| 24 | // type RxToken<'a> = RxToken<'a, 'd> where Self: 'a; | 24 | // type RxToken<'a> = RxToken<'a, 'd> where Self: 'a; |
| 25 | // type TxToken<'a> = TxToken<'a, 'd> where Self: 'a; | 25 | // type TxToken<'a> = TxToken<'a, 'd> where Self: 'a; |
| 26 | type RxToken<'a> = RxToken<'d> where Self: 'a; | 26 | type RxToken<'a> |
| 27 | type TxToken<'a> = TxToken<'d> where Self: 'a; | 27 | = RxToken<'d> |
| 28 | where | ||
| 29 | Self: 'a; | ||
| 30 | type TxToken<'a> | ||
| 31 | = TxToken<'d> | ||
| 32 | where | ||
| 33 | Self: 'a; | ||
| 28 | 34 | ||
| 29 | fn receive(&mut self, cx: &mut Context) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> { | 35 | fn receive(&mut self, cx: &mut Context) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> { |
| 30 | if self.runner.rx_channel.poll_ready_to_receive(cx).is_ready() | 36 | if self.runner.rx_channel.poll_ready_to_receive(cx).is_ready() |
diff --git a/embassy-stm32/src/eth/mod.rs b/embassy-stm32/src/eth/mod.rs index 6442176da..1b875b71a 100644 --- a/embassy-stm32/src/eth/mod.rs +++ b/embassy-stm32/src/eth/mod.rs | |||
| @@ -74,8 +74,14 @@ impl<const TX: usize, const RX: usize> PacketQueue<TX, RX> { | |||
| 74 | static WAKER: AtomicWaker = AtomicWaker::new(); | 74 | static WAKER: AtomicWaker = AtomicWaker::new(); |
| 75 | 75 | ||
| 76 | impl<'d, T: Instance, P: PHY> embassy_net_driver::Driver for Ethernet<'d, T, P> { | 76 | impl<'d, T: Instance, P: PHY> embassy_net_driver::Driver for Ethernet<'d, T, P> { |
| 77 | type RxToken<'a> = RxToken<'a, 'd> where Self: 'a; | 77 | type RxToken<'a> |
| 78 | type TxToken<'a> = TxToken<'a, 'd> where Self: 'a; | 78 | = RxToken<'a, 'd> |
| 79 | where | ||
| 80 | Self: 'a; | ||
| 81 | type TxToken<'a> | ||
| 82 | = TxToken<'a, 'd> | ||
| 83 | where | ||
| 84 | Self: 'a; | ||
| 79 | 85 | ||
| 80 | fn receive(&mut self, cx: &mut Context) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> { | 86 | fn receive(&mut self, cx: &mut Context) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> { |
| 81 | WAKER.register(cx.waker()); | 87 | WAKER.register(cx.waker()); |
