From 08a57b1cb0c3c4a40bd03e6e6ea1c97777300cf4 Mon Sep 17 00:00:00 2001 From: James Munns Date: Wed, 2 Apr 2025 23:30:40 +0200 Subject: Update with changes from the PR --- embassy-executor/Cargo.toml | 5 ++--- embassy-executor/src/raw/run_queue_atomics.rs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'embassy-executor') diff --git a/embassy-executor/Cargo.toml b/embassy-executor/Cargo.toml index 06e12ae7e..ab95b2939 100644 --- a/embassy-executor/Cargo.toml +++ b/embassy-executor/Cargo.toml @@ -82,11 +82,10 @@ avr-device = { version = "0.7.0", optional = true } # `run_queue_atomics` would be enabled, and NOT when `run_queue_critical_section` # would be enabled. [target.'cfg(target_has_atomic="ptr")'.dependencies.cordyceps] -# TODO: targeting v0.3.3, to be released when -# https://github.com/hawkw/mycelium/pull/520 is merged +# TODO: targeting v0.3.3, to be released soon version = "0.3" git = "https://github.com/hawkw/mycelium" -rev = "9649db0525b9972b95937d83d52d3f51cc486281" +rev = "1dad987b483078b248ac3e2e7a75f1ff2b463cc4" [dev-dependencies] critical-section = { version = "1.1", features = ["std"] } diff --git a/embassy-executor/src/raw/run_queue_atomics.rs b/embassy-executor/src/raw/run_queue_atomics.rs index a63f0d116..08765e06b 100644 --- a/embassy-executor/src/raw/run_queue_atomics.rs +++ b/embassy-executor/src/raw/run_queue_atomics.rs @@ -102,7 +102,7 @@ impl RunQueue { // only allows access to this value while the given task is being polled. // This acts as mutual exclusion for access. let mut sorted = - SortedList::::new_custom(|lhs, rhs| unsafe { lhs.deadline.get().cmp(&rhs.deadline.get()) }); + SortedList::::new_with_cmp(|lhs, rhs| unsafe { lhs.deadline.get().cmp(&rhs.deadline.get()) }); loop { // For each loop, grab any newly pended items -- cgit