From 2f2e2c6031a1abaecdac5ed2febe109e647fe6fd Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Mon, 9 Dec 2024 00:28:14 +0100
Subject: Make `integrated-timers` the default, remove Cargo feature.

---
 embassy-time-queue-driver/Cargo.toml | 29 +++++++++++++++--------------
 embassy-time-queue-driver/src/lib.rs | 11 +++++------
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'embassy-time-queue-driver')

diff --git a/embassy-time-queue-driver/Cargo.toml b/embassy-time-queue-driver/Cargo.toml
index 599041a3f..7a10e29b4 100644
--- a/embassy-time-queue-driver/Cargo.toml
+++ b/embassy-time-queue-driver/Cargo.toml
@@ -23,35 +23,36 @@ links = "embassy-time-queue"
 [dependencies]
 critical-section = "1.2.0"
 heapless = "0.8"
-embassy-executor = { version = "0.6.3", path = "../embassy-executor", optional = true }
+embassy-executor = { version = "0.6.3", path = "../embassy-executor" }
 embassy-time-driver = { version = "0.1.0", path = "../embassy-time-driver" }
 
 [features]
 #! ### Generic Queue
 
-## Use the executor-integrated `embassy-time` timer queue. The timer items are stored inside
-## the task headers, so you do not need to set a capacity for the queue.
-## To use this you must have a time driver provided.
-##
-## If this feature is not enabled, a generic queue is available with a configurable capacity.
-integrated-timers = ["embassy-executor/integrated-timers"]
-
-#! The following features set how many timers are used for the generic queue. At most one
+#! By default this crate uses a timer queue implementation that is faster but depends on `embassy-executor`.
+#! It will panic if you try to await any timer when using another executor.
+#! 
+#! Alternatively, you can choose to use a "generic" timer queue implementation that works on any executor.
+#! To enable it, enable any of the features below.
+#! 
+#! The features also set how many timers are used for the generic queue. At most one
 #! `generic-queue-*` feature can be enabled. If none is enabled, a default of 64 timers is used.
 #!
 #! When using embassy-time from libraries, you should *not* enable any `generic-queue-*` feature, to allow the
 #! end user to pick.
 
 ## Generic Queue with 8 timers
-generic-queue-8 = []
+generic-queue-8 = ["_generic-queue"]
 ## Generic Queue with 16 timers
-generic-queue-16 = []
+generic-queue-16 = ["_generic-queue"]
 ## Generic Queue with 32 timers
-generic-queue-32 = []
+generic-queue-32 = ["_generic-queue"]
 ## Generic Queue with 64 timers
-generic-queue-64 = []
+generic-queue-64 = ["_generic-queue"]
 ## Generic Queue with 128 timers
-generic-queue-128 = []
+generic-queue-128 = ["_generic-queue"]
+
+_generic-queue = []
 
 [package.metadata.embassy_docs]
 src_base = "https://github.com/embassy-rs/embassy/blob/embassy-time-queue-driver-v$VERSION/embassy-time-queue-driver/src/"
diff --git a/embassy-time-queue-driver/src/lib.rs b/embassy-time-queue-driver/src/lib.rs
index ed490a0ef..46dd646ca 100644
--- a/embassy-time-queue-driver/src/lib.rs
+++ b/embassy-time-queue-driver/src/lib.rs
@@ -51,16 +51,15 @@
 
 use core::task::Waker;
 
-#[cfg(not(feature = "integrated-timers"))]
+#[cfg(feature = "_generic-queue")]
 pub mod queue_generic;
-#[cfg(feature = "integrated-timers")]
+#[cfg(not(feature = "_generic-queue"))]
 pub mod queue_integrated;
 
-#[cfg(feature = "integrated-timers")]
-pub use queue_integrated::Queue;
-
-#[cfg(not(feature = "integrated-timers"))]
+#[cfg(feature = "_generic-queue")]
 pub use queue_generic::Queue;
+#[cfg(not(feature = "_generic-queue"))]
+pub use queue_integrated::Queue;
 
 extern "Rust" {
     fn _embassy_time_schedule_wake(at: u64, waker: &Waker);
-- 
cgit