From 46961cfdf72a3b5d54b241a41d9f2496c6dc6229 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Mon, 29 May 2023 19:46:28 +0200
Subject: Fix tests.

---
 embassy-time/src/driver.rs        |  2 +-
 embassy-time/src/queue_generic.rs | 15 +++++++++------
 embassy-time/src/timer.rs         |  1 -
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'embassy-time/src')

diff --git a/embassy-time/src/driver.rs b/embassy-time/src/driver.rs
index 5c2ad3b23..d6436369b 100644
--- a/embassy-time/src/driver.rs
+++ b/embassy-time/src/driver.rs
@@ -49,7 +49,7 @@
 //!     fn set_alarm_callback(&self, alarm: AlarmHandle, callback: fn(*mut ()), ctx: *mut ()) {
 //!         todo!()
 //!     }
-//!     fn set_alarm(&self, alarm: AlarmHandle, timestamp: u64) {
+//!     fn set_alarm(&self, alarm: AlarmHandle, timestamp: u64) -> bool {
 //!         todo!()
 //!     }
 //! }
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 {
 
     use serial_test::serial;
 
-    use super::InnerQueue;
     use crate::driver::{AlarmHandle, Driver};
     use crate::queue_generic::QUEUE;
     use crate::Instant;
@@ -317,14 +316,18 @@ mod tests {
 
     fn setup() {
         DRIVER.reset();
-
-        QUEUE.inner.lock(|inner| {
-            *inner.borrow_mut() = InnerQueue::new();
-        });
+        critical_section::with(|cs| *QUEUE.inner.borrow_ref_mut(cs) = None);
     }
 
     fn queue_len() -> usize {
-        QUEUE.inner.lock(|inner| inner.borrow().queue.iter().count())
+        critical_section::with(|cs| {
+            QUEUE
+                .inner
+                .borrow_ref(cs)
+                .as_ref()
+                .map(|inner| inner.queue.iter().count())
+                .unwrap_or(0)
+        })
     }
 
     #[test]
diff --git a/embassy-time/src/timer.rs b/embassy-time/src/timer.rs
index 52620d233..d3d1f9f5f 100644
--- a/embassy-time/src/timer.rs
+++ b/embassy-time/src/timer.rs
@@ -109,7 +109,6 @@ impl Future for Timer {
 /// # #![feature(type_alias_impl_trait)]
 /// #
 /// use embassy_time::{Duration, Ticker};
-/// use futures::StreamExt;
 /// # fn foo(){}
 ///
 /// #[embassy_executor::task]
-- 
cgit