aboutsummaryrefslogtreecommitdiff
path: root/embassy-net
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2022-09-22 16:42:49 +0200
committerDario Nieuwenhuis <[email protected]>2022-09-22 16:42:49 +0200
commita0487380da42a71ab7532e2bc1befd1039c18a78 (patch)
treebb235fc3ba54f31838f3b546f7b4734ee8b42558 /embassy-net
parent897b72c872183221e088611aa6f30989800afd2b (diff)
Replace futures::future::poll_fn -> core::future::poll_fn.
Diffstat (limited to 'embassy-net')
-rw-r--r--embassy-net/src/stack.rs3
-rw-r--r--embassy-net/src/tcp.rs6
-rw-r--r--embassy-net/src/udp.rs2
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 @@
1use core::cell::UnsafeCell; 1use core::cell::UnsafeCell;
2use core::future::Future; 2use core::future::{poll_fn, Future};
3use core::task::{Context, Poll}; 3use core::task::{Context, Poll};
4 4
5use embassy_sync::waitqueue::WakerRegistration; 5use embassy_sync::waitqueue::WakerRegistration;
6use embassy_time::{Instant, Timer}; 6use embassy_time::{Instant, Timer};
7use futures::future::poll_fn;
8use futures::pin_mut; 7use futures::pin_mut;
9use heapless::Vec; 8use 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 @@
1use core::cell::UnsafeCell; 1use core::cell::UnsafeCell;
2use core::future::poll_fn;
2use core::mem; 3use core::mem;
3use core::task::Poll; 4use core::task::Poll;
4 5
5use futures::future::poll_fn;
6use smoltcp::iface::{Interface, SocketHandle}; 6use smoltcp::iface::{Interface, SocketHandle};
7use smoltcp::socket::tcp; 7use smoltcp::socket::tcp;
8use smoltcp::time::Duration; 8use 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 @@
1use core::cell::UnsafeCell; 1use core::cell::UnsafeCell;
2use core::future::poll_fn;
2use core::mem; 3use core::mem;
3use core::task::Poll; 4use core::task::Poll;
4 5
5use futures::future::poll_fn;
6use smoltcp::iface::{Interface, SocketHandle}; 6use smoltcp::iface::{Interface, SocketHandle};
7use smoltcp::socket::udp::{self, PacketMetadata}; 7use smoltcp::socket::udp::{self, PacketMetadata};
8use smoltcp::wire::{IpEndpoint, IpListenEndpoint}; 8use smoltcp::wire::{IpEndpoint, IpListenEndpoint};