aboutsummaryrefslogtreecommitdiff
path: root/embassy-time/src/queue_generic.rs
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2023-05-29 18:09:05 +0000
committerGitHub <[email protected]>2023-05-29 18:09:05 +0000
commit642eb1400ba5508321d7aed438dc5033a652e2fb (patch)
tree82e888ad5ea0af46fd33188fdf923e3d2ecd0a1a /embassy-time/src/queue_generic.rs
parentcc23129456832ce4d65ce0b8088a011395fca4fb (diff)
parent421ee4dfbfbbdc007265498d4f529687c16d89af (diff)
Merge pull request #1503 from embassy-rs/ci-fixes
ci: add stable build, add tests.
Diffstat (limited to 'embassy-time/src/queue_generic.rs')
-rw-r--r--embassy-time/src/queue_generic.rs15
1 files changed, 9 insertions, 6 deletions
diff --git a/embassy-time/src/queue_generic.rs b/embassy-time/src/queue_generic.rs
index 64a8af4bc..4795eb2f3 100644
--- a/embassy-time/src/queue_generic.rs
+++ b/embassy-time/src/queue_generic.rs
@@ -183,7 +183,6 @@ mod tests {
183 183
184 use serial_test::serial; 184 use serial_test::serial;
185 185
186 use super::InnerQueue;
187 use crate::driver::{AlarmHandle, Driver}; 186 use crate::driver::{AlarmHandle, Driver};
188 use crate::queue_generic::QUEUE; 187 use crate::queue_generic::QUEUE;
189 use crate::Instant; 188 use crate::Instant;
@@ -317,14 +316,18 @@ mod tests {
317 316
318 fn setup() { 317 fn setup() {
319 DRIVER.reset(); 318 DRIVER.reset();
320 319 critical_section::with(|cs| *QUEUE.inner.borrow_ref_mut(cs) = None);
321 QUEUE.inner.lock(|inner| {
322 *inner.borrow_mut() = InnerQueue::new();
323 });
324 } 320 }
325 321
326 fn queue_len() -> usize { 322 fn queue_len() -> usize {
327 QUEUE.inner.lock(|inner| inner.borrow().queue.iter().count()) 323 critical_section::with(|cs| {
324 QUEUE
325 .inner
326 .borrow_ref(cs)
327 .as_ref()
328 .map(|inner| inner.queue.iter().count())
329 .unwrap_or(0)
330 })
328 } 331 }
329 332
330 #[test] 333 #[test]