aboutsummaryrefslogtreecommitdiff
path: root/embassy-net/src/stack.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-09-22 15:46:07 +0000
committerGitHub <[email protected]>2022-09-22 15:46:07 +0000
commitdacbc9acd5969d3ef0dda8825c960e909008ce83 (patch)
tree87d150bf3398969d4e8cec4f014e8d5ea043ec3a /embassy-net/src/stack.rs
parentc1e25067daa53983777807f6d173f1318767b88a (diff)
parent10d1ad2343825388277dc54db649c9349a0b6de8 (diff)
Merge #963
963: Remove some uses of the `futures` crate r=Dirbaio a=Dirbaio - use `Future` from `core` - `poll_fn` is now stable in `core` since Rust 1.64 (out today) - Use `join` from `embassy-futures`. Co-authored-by: Dario Nieuwenhuis <[email protected]>
Diffstat (limited to 'embassy-net/src/stack.rs')
-rw-r--r--embassy-net/src/stack.rs3
1 files changed, 1 insertions, 2 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")]