diff options
| author | Quentin Smith <[email protected]> | 2022-08-23 23:01:51 -0400 |
|---|---|---|
| committer | Quentin Smith <[email protected]> | 2022-08-23 23:01:51 -0400 |
| commit | 2900ab79e7afa0ca3e0d800f8a91c3253a333db1 (patch) | |
| tree | a5066235f8b1ac6c2520105db2e5c48630bc006d /embassy-net | |
| parent | 14eae9ca06f63a69ccc29d5fd9e1dec3848a3e98 (diff) | |
| parent | 529535194d4b5d58b31fd6a7541176105e3c63f7 (diff) | |
Merge remote-tracking branch 'origin/master' into nrf-pdm
Diffstat (limited to 'embassy-net')
| -rw-r--r-- | embassy-net/Cargo.toml | 2 | ||||
| -rw-r--r-- | embassy-net/src/stack.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/embassy-net/Cargo.toml b/embassy-net/Cargo.toml index 9f9bb2261..2143f36d3 100644 --- a/embassy-net/Cargo.toml +++ b/embassy-net/Cargo.toml | |||
| @@ -38,7 +38,7 @@ defmt = { version = "0.3", optional = true } | |||
| 38 | log = { version = "0.4.14", optional = true } | 38 | log = { version = "0.4.14", optional = true } |
| 39 | 39 | ||
| 40 | embassy-time = { version = "0.1.0", path = "../embassy-time" } | 40 | embassy-time = { version = "0.1.0", path = "../embassy-time" } |
| 41 | embassy-util = { version = "0.1.0", path = "../embassy-util" } | 41 | embassy-sync = { version = "0.1.0", path = "../embassy-sync" } |
| 42 | embedded-io = { version = "0.3.0", features = [ "async" ] } | 42 | embedded-io = { version = "0.3.0", features = [ "async" ] } |
| 43 | 43 | ||
| 44 | managed = { version = "0.8.0", default-features = false, features = [ "map" ] } | 44 | managed = { version = "0.8.0", default-features = false, features = [ "map" ] } |
diff --git a/embassy-net/src/stack.rs b/embassy-net/src/stack.rs index 4b6a7ae2a..8d2dd4bca 100644 --- a/embassy-net/src/stack.rs +++ b/embassy-net/src/stack.rs | |||
| @@ -2,8 +2,8 @@ use core::cell::UnsafeCell; | |||
| 2 | use core::future::Future; | 2 | use core::future::Future; |
| 3 | use core::task::{Context, Poll}; | 3 | use core::task::{Context, Poll}; |
| 4 | 4 | ||
| 5 | use embassy_sync::waitqueue::WakerRegistration; | ||
| 5 | use embassy_time::{Instant, Timer}; | 6 | use embassy_time::{Instant, Timer}; |
| 6 | use embassy_util::waitqueue::WakerRegistration; | ||
| 7 | use futures::future::poll_fn; | 7 | use futures::future::poll_fn; |
| 8 | use futures::pin_mut; | 8 | use futures::pin_mut; |
| 9 | use heapless::Vec; | 9 | use heapless::Vec; |
