summaryrefslogtreecommitdiff
path: root/embassy-net
diff options
context:
space:
mode:
authorDario Nieuwenhuis <dirbaio@dirbaio.net>2022-09-22 16:42:49 +0200
committerDario Nieuwenhuis <dirbaio@dirbaio.net>2022-09-22 16:42:49 +0200
commita0487380da42a71ab7532e2bc1befd1039c18a78 (patch)
treebb235fc3ba54f31838f3b546f7b4734ee8b42558 /embassy-net
parent897b72c872183221e088611aa6f30989800afd2b (diff)
downloadembassy-a0487380da42a71ab7532e2bc1befd1039c18a78.zip
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 8d2dd4bc..3a761075 100644
--- a/embassy-net/src/stack.rs
+++ b/embassy-net/src/stack.rs
@@ -1,10 +1,9 @@
use core::cell::UnsafeCell;
-use core::future::Future;
+use core::future::{poll_fn, Future};
use core::task::{Context, Poll};
use embassy_sync::waitqueue::WakerRegistration;
use embassy_time::{Instant, Timer};
-use futures::future::poll_fn;
use futures::pin_mut;
use heapless::Vec;
#[cfg(feature = "dhcpv4")]
diff --git a/embassy-net/src/tcp.rs b/embassy-net/src/tcp.rs
index 0fa87360..f8fff3e2 100644
--- a/embassy-net/src/tcp.rs
+++ b/embassy-net/src/tcp.rs
@@ -1,8 +1,8 @@
use core::cell::UnsafeCell;
+use core::future::poll_fn;
use core::mem;
use core::task::Poll;
-use futures::future::poll_fn;
use smoltcp::iface::{Interface, SocketHandle};
use smoltcp::socket::tcp;
use smoltcp::time::Duration;
@@ -103,7 +103,7 @@ impl<'a> TcpSocket<'a> {
Err(tcp::ConnectError::Unaddressable) => return Err(ConnectError::NoRoute),
}
- futures::future::poll_fn(|cx| unsafe {
+ poll_fn(|cx| unsafe {
self.io.with_mut(|s, _| match s.state() {
tcp::State::Closed | tcp::State::TimeWait => Poll::Ready(Err(ConnectError::ConnectionReset)),
tcp::State::Listen => unreachable!(),
@@ -128,7 +128,7 @@ impl<'a> TcpSocket<'a> {
Err(tcp::ListenError::Unaddressable) => return Err(AcceptError::InvalidPort),
}
- futures::future::poll_fn(|cx| unsafe {
+ poll_fn(|cx| unsafe {
self.io.with_mut(|s, _| match s.state() {
tcp::State::Listen | tcp::State::SynSent | tcp::State::SynReceived => {
s.register_send_waker(cx.waker());
diff --git a/embassy-net/src/udp.rs b/embassy-net/src/udp.rs
index 78b09a49..f2e33493 100644
--- a/embassy-net/src/udp.rs
+++ b/embassy-net/src/udp.rs
@@ -1,8 +1,8 @@
use core::cell::UnsafeCell;
+use core::future::poll_fn;
use core::mem;
use core::task::Poll;
-use futures::future::poll_fn;
use smoltcp::iface::{Interface, SocketHandle};
use smoltcp::socket::udp::{self, PacketMetadata};
use smoltcp::wire::{IpEndpoint, IpListenEndpoint};