diff options
| author | Dario Nieuwenhuis <[email protected]> | 2022-09-22 16:42:49 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2022-09-22 16:42:49 +0200 |
| commit | a0487380da42a71ab7532e2bc1befd1039c18a78 (patch) | |
| tree | bb235fc3ba54f31838f3b546f7b4734ee8b42558 /embassy-net | |
| parent | 897b72c872183221e088611aa6f30989800afd2b (diff) | |
Replace futures::future::poll_fn -> core::future::poll_fn.
Diffstat (limited to 'embassy-net')
| -rw-r--r-- | embassy-net/src/stack.rs | 3 | ||||
| -rw-r--r-- | embassy-net/src/tcp.rs | 6 | ||||
| -rw-r--r-- | embassy-net/src/udp.rs | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/embassy-net/src/stack.rs b/embassy-net/src/stack.rs index 8d2dd4bca..3a7610758 100644 --- a/embassy-net/src/stack.rs +++ b/embassy-net/src/stack.rs | |||
| @@ -1,10 +1,9 @@ | |||
| 1 | use core::cell::UnsafeCell; | 1 | use core::cell::UnsafeCell; |
| 2 | use core::future::Future; | 2 | use core::future::{poll_fn, Future}; |
| 3 | use core::task::{Context, Poll}; | 3 | use core::task::{Context, Poll}; |
| 4 | 4 | ||
| 5 | use embassy_sync::waitqueue::WakerRegistration; | 5 | use embassy_sync::waitqueue::WakerRegistration; |
| 6 | use embassy_time::{Instant, Timer}; | 6 | use embassy_time::{Instant, Timer}; |
| 7 | use futures::future::poll_fn; | ||
| 8 | use futures::pin_mut; | 7 | use futures::pin_mut; |
| 9 | use heapless::Vec; | 8 | use heapless::Vec; |
| 10 | #[cfg(feature = "dhcpv4")] | 9 | #[cfg(feature = "dhcpv4")] |
diff --git a/embassy-net/src/tcp.rs b/embassy-net/src/tcp.rs index 0fa873602..f8fff3e2d 100644 --- a/embassy-net/src/tcp.rs +++ b/embassy-net/src/tcp.rs | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | use core::cell::UnsafeCell; | 1 | use core::cell::UnsafeCell; |
| 2 | use core::future::poll_fn; | ||
| 2 | use core::mem; | 3 | use core::mem; |
| 3 | use core::task::Poll; | 4 | use core::task::Poll; |
| 4 | 5 | ||
| 5 | use futures::future::poll_fn; | ||
| 6 | use smoltcp::iface::{Interface, SocketHandle}; | 6 | use smoltcp::iface::{Interface, SocketHandle}; |
| 7 | use smoltcp::socket::tcp; | 7 | use smoltcp::socket::tcp; |
| 8 | use smoltcp::time::Duration; | 8 | use smoltcp::time::Duration; |
| @@ -103,7 +103,7 @@ impl<'a> TcpSocket<'a> { | |||
| 103 | Err(tcp::ConnectError::Unaddressable) => return Err(ConnectError::NoRoute), | 103 | Err(tcp::ConnectError::Unaddressable) => return Err(ConnectError::NoRoute), |
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | futures::future::poll_fn(|cx| unsafe { | 106 | poll_fn(|cx| unsafe { |
| 107 | self.io.with_mut(|s, _| match s.state() { | 107 | self.io.with_mut(|s, _| match s.state() { |
| 108 | tcp::State::Closed | tcp::State::TimeWait => Poll::Ready(Err(ConnectError::ConnectionReset)), | 108 | tcp::State::Closed | tcp::State::TimeWait => Poll::Ready(Err(ConnectError::ConnectionReset)), |
| 109 | tcp::State::Listen => unreachable!(), | 109 | tcp::State::Listen => unreachable!(), |
| @@ -128,7 +128,7 @@ impl<'a> TcpSocket<'a> { | |||
| 128 | Err(tcp::ListenError::Unaddressable) => return Err(AcceptError::InvalidPort), | 128 | Err(tcp::ListenError::Unaddressable) => return Err(AcceptError::InvalidPort), |
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | futures::future::poll_fn(|cx| unsafe { | 131 | poll_fn(|cx| unsafe { |
| 132 | self.io.with_mut(|s, _| match s.state() { | 132 | self.io.with_mut(|s, _| match s.state() { |
| 133 | tcp::State::Listen | tcp::State::SynSent | tcp::State::SynReceived => { | 133 | tcp::State::Listen | tcp::State::SynSent | tcp::State::SynReceived => { |
| 134 | s.register_send_waker(cx.waker()); | 134 | s.register_send_waker(cx.waker()); |
diff --git a/embassy-net/src/udp.rs b/embassy-net/src/udp.rs index 78b09a492..f2e33493c 100644 --- a/embassy-net/src/udp.rs +++ b/embassy-net/src/udp.rs | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | use core::cell::UnsafeCell; | 1 | use core::cell::UnsafeCell; |
| 2 | use core::future::poll_fn; | ||
| 2 | use core::mem; | 3 | use core::mem; |
| 3 | use core::task::Poll; | 4 | use core::task::Poll; |
| 4 | 5 | ||
| 5 | use futures::future::poll_fn; | ||
| 6 | use smoltcp::iface::{Interface, SocketHandle}; | 6 | use smoltcp::iface::{Interface, SocketHandle}; |
| 7 | use smoltcp::socket::udp::{self, PacketMetadata}; | 7 | use smoltcp::socket::udp::{self, PacketMetadata}; |
| 8 | use smoltcp::wire::{IpEndpoint, IpListenEndpoint}; | 8 | use smoltcp::wire::{IpEndpoint, IpListenEndpoint}; |
