diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-08-17 23:22:52 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-08-17 23:22:52 +0000 |
| commit | be55d2a39eb399d693d11f37dfa4b87cd2bd3c7a (patch) | |
| tree | 2ef0b4d6f9b1c02dac2589e7b57982c20cbc0e66 /embassy-net/src | |
| parent | 1c5b54a4823d596db730eb476c3ab78110557214 (diff) | |
| parent | 5daa173ce4b153a532b4daa9e94c7a248231f25b (diff) | |
Merge #909
909: Split embassy-time from embassy-executor. r=Dirbaio a=Dirbaio
For now this will fail to link unless you enable `embassy-executor/integrated-timers`. i'll add an executor-independent timer queue to `embassy-time` later.
Co-authored-by: Dario Nieuwenhuis <[email protected]>
Diffstat (limited to 'embassy-net/src')
| -rw-r--r-- | embassy-net/src/stack.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/embassy-net/src/stack.rs b/embassy-net/src/stack.rs index 06bb732ff..4b6a7ae2a 100644 --- a/embassy-net/src/stack.rs +++ b/embassy-net/src/stack.rs | |||
| @@ -2,7 +2,7 @@ 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_executor::time::{Instant, Timer}; | 5 | use embassy_time::{Instant, Timer}; |
| 6 | use embassy_util::waitqueue::WakerRegistration; | 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; |
