diff options
Diffstat (limited to 'embassy-executor')
| -rw-r--r-- | embassy-executor/Cargo.toml | 5 | ||||
| -rw-r--r-- | embassy-executor/src/raw/run_queue_atomics.rs | 2 |
2 files changed, 3 insertions, 4 deletions
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 } | |||
| 82 | # `run_queue_atomics` would be enabled, and NOT when `run_queue_critical_section` | 82 | # `run_queue_atomics` would be enabled, and NOT when `run_queue_critical_section` |
| 83 | # would be enabled. | 83 | # would be enabled. |
| 84 | [target.'cfg(target_has_atomic="ptr")'.dependencies.cordyceps] | 84 | [target.'cfg(target_has_atomic="ptr")'.dependencies.cordyceps] |
| 85 | # TODO: targeting v0.3.3, to be released when | 85 | # TODO: targeting v0.3.3, to be released soon |
| 86 | # https://github.com/hawkw/mycelium/pull/520 is merged | ||
| 87 | version = "0.3" | 86 | version = "0.3" |
| 88 | git = "https://github.com/hawkw/mycelium" | 87 | git = "https://github.com/hawkw/mycelium" |
| 89 | rev = "9649db0525b9972b95937d83d52d3f51cc486281" | 88 | rev = "1dad987b483078b248ac3e2e7a75f1ff2b463cc4" |
| 90 | 89 | ||
| 91 | [dev-dependencies] | 90 | [dev-dependencies] |
| 92 | critical-section = { version = "1.1", features = ["std"] } | 91 | 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 { | |||
| 102 | // only allows access to this value while the given task is being polled. | 102 | // only allows access to this value while the given task is being polled. |
| 103 | // This acts as mutual exclusion for access. | 103 | // This acts as mutual exclusion for access. |
| 104 | let mut sorted = | 104 | let mut sorted = |
| 105 | SortedList::<TaskHeader>::new_custom(|lhs, rhs| unsafe { lhs.deadline.get().cmp(&rhs.deadline.get()) }); | 105 | SortedList::<TaskHeader>::new_with_cmp(|lhs, rhs| unsafe { lhs.deadline.get().cmp(&rhs.deadline.get()) }); |
| 106 | 106 | ||
| 107 | loop { | 107 | loop { |
| 108 | // For each loop, grab any newly pended items | 108 | // For each loop, grab any newly pended items |
