aboutsummaryrefslogtreecommitdiff
path: root/embassy-net/src
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2024-10-14 00:12:45 +0200
committerDario Nieuwenhuis <[email protected]>2024-10-14 00:12:45 +0200
commit9a45d776d870582cda3db0db233e3f5aea15d34e (patch)
tree12f265a48ac95cef8c91b0fb2ce7443dd6328988 /embassy-net/src
parentee669ee5c57851ade034beca7cfaf81825c4c21b (diff)
rustfmt for new nightly.
Diffstat (limited to 'embassy-net/src')
-rw-r--r--embassy-net/src/driver_util.rs10
-rw-r--r--embassy-net/src/tcp.rs5
2 files changed, 12 insertions, 3 deletions
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>
18where 18where
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() {