Remove explicit generic-queue features

esp-hal-embassy/Cargo.toml

@@ -51,13 +51,11 @@ defmt = ["dep:defmt", "embassy-executor?/defmt", "esp-hal/defmt"]
 log = ["dep:log"]
 ## Provide `Executor` and `InterruptExecutor`
 executors = ["dep:embassy-executor", "esp-hal/__esp_hal_embassy"]
-## Use the executor-integrated `embassy-time` timer queue.
+## Use the executor-integrated `embassy-time` timer queue. If not set, the crate provides a generic
+## timer queue that can be used with any executor.
 integrated-timers = ["embassy-executor?/integrated-timers", "executors"]
-## Implement a generic timer queue. This option is useful if you intend to use a different executor
-## than `embassy-executor`.
-generic-queue = ["single-queue"]
 ## Use a single, global timer queue. This option only needs a single alarm, no matter how many
-## executors are used.
+## executors are used. Ignored if `integrated-timers` is not set.
 single-queue = []
 
 [lints.rust]

esp-hal-embassy/src/time_driver.rs

@@ -246,7 +246,7 @@ fn not_enough_timers() -> ! {
     // This is wrapped in a separate function because rustfmt does not like
     // extremely long strings. Also, if log is used, this avoids storing the string
     // twice.
-    panic!("There are not enough timers to allocate a new alarm. Call esp_hal_embassy::init() with the correct number of timers, or consider using one of the embassy-timer/generic-queue-X features.");
+    panic!("There are not enough timers to allocate a new alarm. Call esp_hal_embassy::init() with the correct number of timers, or consider either using the single-queue feature or disabling integrated-timers.");
 }
 
 pub(crate) struct TimerQueueDriver {

examples/Cargo.toml

@@ -63,7 +63,6 @@ esp32s3 = ["esp-hal/esp32s3", "esp-backtrace/esp32s3", "esp-hal-embassy?/esp32s3
 esp-wifi = ["dep:esp-wifi"]
 
 embassy                = ["dep:esp-hal-embassy"]
-embassy-generic-queue  = ["esp-hal-embassy/generic-queue"]
 
 [profile.release]
 codegen-units    = 1

examples/src/bin/embassy_multicore.rs

@@ -7,7 +7,7 @@
 //! - LED => GPIO0
 
 //% CHIPS: esp32 esp32s3
-//% FEATURES: embassy embassy-generic-timers esp-hal/unstable
+//% FEATURES: embassy esp-hal/unstable
 
 #![no_std]
 #![no_main]

examples/src/bin/embassy_multicore_interrupt.rs

@@ -7,7 +7,7 @@
 //! - LED => GPIO0
 
 //% CHIPS: esp32 esp32s3
-//% FEATURES: embassy embassy-generic-timers esp-hal/unstable
+//% FEATURES: embassy esp-hal/unstable
 
 #![no_std]
 #![no_main]

examples/src/bin/embassy_rmt_rx.rs

@@ -4,7 +4,7 @@
 //! - Connect GPIO4 and GPIO5
 
 //% CHIPS: esp32 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: embassy embassy-generic-timers esp-hal/unstable
+//% FEATURES: embassy esp-hal/unstable
 
 #![no_std]
 #![no_main]

examples/src/bin/embassy_rmt_tx.rs

@@ -6,7 +6,7 @@
 //! - generated pulses => GPIO4
 
 //% CHIPS: esp32 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: embassy embassy-generic-timers esp-hal/unstable
+//% FEATURES: embassy esp-hal/unstable
 
 #![no_std]
 #![no_main]

examples/src/bin/embassy_serial.rs

@@ -4,7 +4,7 @@
 //! writing to and reading from UART.
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: embassy embassy-generic-timers esp-hal/unstable
+//% FEATURES: embassy esp-hal/unstable
 
 #![no_std]
 #![no_main]

examples/src/bin/embassy_spi.rs

@@ -13,7 +13,7 @@
 //! CS   => GPIO5
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: embassy embassy-generic-timers esp-hal/unstable
+//% FEATURES: embassy esp-hal/unstable
 
 #![no_std]
 #![no_main]

examples/src/bin/embassy_usb_serial.rs

@@ -7,7 +7,7 @@
 //! - DM => GPIO19
 
 //% CHIPS: esp32s2 esp32s3
-//% FEATURES: embassy embassy-generic-timers esp-hal/unstable
+//% FEATURES: embassy esp-hal/unstable
 
 #![no_std]
 #![no_main]

examples/src/bin/embassy_usb_serial_jtag.rs

@@ -3,7 +3,7 @@
 //! Most dev-kits use a USB-UART-bridge - in that case you won't see any output.
 
 //% CHIPS: esp32c3 esp32c6 esp32h2 esp32s3
-//% FEATURES: embassy embassy-generic-timers esp-hal/unstable
+//% FEATURES: embassy esp-hal/unstable
 
 #![no_std]
 #![no_main]

examples/src/bin/wifi_embassy_access_point.rs

@@ -9,7 +9,7 @@
 //! Because of the huge task-arena size configured this won't work on ESP32-S2
 //!
 
-//% FEATURES: embassy embassy-generic-timers esp-wifi esp-wifi/wifi esp-wifi/utils esp-wifi/sniffer esp-hal/unstable
+//% FEATURES: embassy esp-wifi esp-wifi/wifi esp-wifi/utils esp-wifi/sniffer esp-hal/unstable
 //% CHIPS: esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6
 
 #![no_std]

examples/src/bin/wifi_embassy_access_point_with_sta.rs

@@ -12,7 +12,7 @@
 //! Because of the huge task-arena size configured this won't work on ESP32-S2
 //!
 
-//% FEATURES: embassy embassy-generic-timers esp-wifi esp-wifi/wifi esp-wifi/utils esp-hal/unstable
+//% FEATURES: embassy esp-wifi esp-wifi/wifi esp-wifi/utils esp-hal/unstable
 //% CHIPS: esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6
 
 #![no_std]

examples/src/bin/wifi_embassy_bench.rs

@@ -10,7 +10,7 @@
 //! Because of the huge task-arena size configured this won't work on ESP32-S2 and ESP32-C2
 //!
 
-//% FEATURES: embassy embassy-generic-timers esp-wifi esp-wifi/wifi esp-wifi/utils esp-hal/unstable
+//% FEATURES: embassy esp-wifi esp-wifi/wifi esp-wifi/utils esp-hal/unstable
 //% CHIPS: esp32 esp32s2 esp32s3 esp32c3 esp32c6
 
 #![allow(static_mut_refs)]

examples/src/bin/wifi_embassy_ble.rs

@@ -4,7 +4,7 @@
 //! - offers one service with three characteristics (one is read/write, one is write only, one is read/write/notify)
 //! - pressing the boot-button on a dev-board will send a notification if it is subscribed
 
-//% FEATURES: embassy embassy-generic-timers esp-wifi esp-wifi/ble esp-hal/unstable
+//% FEATURES: embassy esp-wifi esp-wifi/ble esp-hal/unstable
 //% CHIPS: esp32 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2
 
 #![no_std]

examples/src/bin/wifi_embassy_dhcp.rs

@@ -7,7 +7,7 @@
 //!
 //! Because of the huge task-arena size configured this won't work on ESP32-S2
 
-//% FEATURES: embassy embassy-generic-timers esp-wifi esp-wifi/wifi esp-wifi/utils esp-hal/unstable
+//% FEATURES: embassy esp-wifi esp-wifi/wifi esp-wifi/utils esp-hal/unstable
 //% CHIPS: esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6
 
 #![no_std]

examples/src/bin/wifi_embassy_esp_now.rs

@@ -4,7 +4,7 @@
 //!
 //! Because of the huge task-arena size configured this won't work on ESP32-S2
 
-//% FEATURES: embassy embassy-generic-timers esp-wifi esp-wifi/wifi esp-wifi/utils esp-wifi/esp-now esp-hal/unstable
+//% FEATURES: embassy esp-wifi esp-wifi/wifi esp-wifi/utils esp-wifi/esp-now esp-hal/unstable
 //% CHIPS: esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6
 
 #![no_std]

examples/src/bin/wifi_embassy_esp_now_duplex.rs

@@ -4,7 +4,7 @@
 //!
 //! Because of the huge task-arena size configured this won't work on ESP32-S2
 
-//% FEATURES: embassy embassy-generic-timers esp-wifi esp-wifi/wifi esp-wifi/utils esp-wifi/esp-now esp-hal/unstable
+//% FEATURES: embassy esp-wifi esp-wifi/wifi esp-wifi/utils esp-wifi/esp-now esp-hal/unstable
 //% CHIPS: esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6
 
 #![no_std]

examples/src/bin/wifi_embassy_trouble.rs

@@ -5,7 +5,7 @@
 //! - automatically notifies subscribers every second
 //!
 
-//% FEATURES: embassy embassy-generic-timers esp-wifi esp-wifi/ble esp-hal/unstable
+//% FEATURES: embassy esp-wifi esp-wifi/ble esp-hal/unstable
 //% CHIPS: esp32 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2
 
 #![no_std]

hil-test/Cargo.toml

@@ -290,7 +290,6 @@ esp32s3 = [
 embassy = [
     "dep:esp-hal-embassy",
 ]
-generic-queue = ["embassy", "esp-hal-embassy?/generic-queue"]
 integrated-timers = ["embassy", "esp-hal-embassy?/integrated-timers"]
 octal-psram = ["esp-hal/octal-psram", "esp-alloc"]
 

hil-test/tests/embassy_interrupt_executor.rs

@@ -3,7 +3,7 @@
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
 //% FEATURES(integrated): unstable embassy integrated-timers
-//% FEATURES(generic): unstable embassy generic-queue
+//% FEATURES(generic): unstable embassy
 
 #![no_std]
 #![no_main]

hil-test/tests/embassy_interrupt_spi_dma.rs

@@ -2,7 +2,7 @@
 
 //% CHIPS: esp32 esp32s2 esp32s3 esp32c3 esp32c6 esp32h2
 //% FEATURES(integrated): unstable embassy integrated-timers
-//% FEATURES(generic): unstable embassy generic-queue
+//% FEATURES(generic): unstable embassy
 
 #![no_std]
 #![no_main]

hil-test/tests/embassy_timers_executors.rs

@@ -2,7 +2,7 @@
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
 //% FEATURES(integrated): unstable embassy integrated-timers
-//% FEATURES(generic): unstable embassy generic-queue
+//% FEATURES(generic): unstable embassy
 
 #![no_std]
 #![no_main]

hil-test/tests/gpio.rs

@@ -1,7 +1,7 @@
 //! GPIO Test
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: unstable embassy generic-queue
+//% FEATURES: unstable embassy
 //% FEATURES(stable):
 
 #![no_std]

hil-test/tests/i2s.rs

@@ -4,7 +4,7 @@
 //! with loopback mode enabled).
 
 //% CHIPS: esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: unstable generic-queue
+//% FEATURES: unstable
 // FIXME: re-enable on ESP32 when it no longer fails spuriously
 
 #![no_std]

hil-test/tests/lcd_cam_i8080_async.rs

@@ -1,7 +1,7 @@
 //! lcd_cam i8080 tests
 
 //% CHIPS: esp32s3
-//% FEATURES: unstable generic-queue
+//% FEATURES: unstable
 
 #![no_std]
 #![no_main]

hil-test/tests/parl_io_tx_async.rs

@@ -1,7 +1,7 @@
 //! PARL_IO TX async test
 
 //% CHIPS: esp32c6 esp32h2
-//% FEATURES: unstable generic-queue
+//% FEATURES: unstable
 
 #![no_std]
 #![no_main]

hil-test/tests/spi_full_duplex.rs

@@ -1,7 +1,7 @@
 //! SPI Full Duplex test suite.
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: unstable generic-queue
+//% FEATURES: unstable
 
 // FIXME: add async test cases that don't rely on PCNT
 

hil-test/tests/uart_async.rs

@@ -1,7 +1,7 @@
 //! UART Test
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: unstable embassy generic-queue
+//% FEATURES: unstable embassy
 
 #![no_std]
 #![no_main]

hil-test/tests/uart_tx_rx_async.rs

@@ -1,7 +1,7 @@
 //! UART TX/RX Async Test
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: unstable generic-queue
+//% FEATURES: unstable
 
 #![no_std]
 #![no_main]

qa-test/Cargo.toml

@@ -28,8 +28,6 @@ esp32h2 = ["esp-backtrace/esp32h2", "esp-hal/esp32h2", "esp-hal-embassy/esp32h2"
 esp32s2 = ["esp-backtrace/esp32s2", "esp-hal/esp32s2", "esp-hal-embassy/esp32s2", "esp-println/esp32s2"]
 esp32s3 = ["esp-backtrace/esp32s3", "esp-hal/esp32s3", "esp-hal-embassy/esp32s3", "esp-println/esp32s3"]
 
-embassy-generic-timers = ["esp-hal-embassy/generic-queue"]
-
 [profile.release]
 debug         = 2
 debug-assertions = true

qa-test/src/bin/embassy_executor_benchmark.rs

@@ -3,7 +3,7 @@
 //% CHIPS: esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
 //% FEATURES: esp-hal-embassy/integrated-timers
 // FEATURES: esp-hal-embassy/integrated-timers esp-hal-embassy/single-queue
-// FEATURES: embassy-generic-timers
+// FEATURES:
 
 #![no_std]
 #![no_main]

qa-test/src/bin/embassy_i2c.rs

@@ -11,7 +11,6 @@
 //! - SCL => GPIO5
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: embassy-generic-timers
 
 #![no_std]
 #![no_main]

qa-test/src/bin/embassy_i2c_bmp180_calibration_data.rs

@@ -11,7 +11,6 @@
 //! pins.
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: embassy-generic-timers
 //% TAG: bmp180
 
 #![no_std]

qa-test/src/bin/embassy_i2s_read.rs

@@ -12,7 +12,6 @@
 //! - DIN  =>  GPIO5
 
 //% CHIPS: esp32 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: embassy-generic-timers
 
 #![no_std]
 #![no_main]

qa-test/src/bin/embassy_i2s_sound.rs

@@ -26,7 +26,6 @@
 //! | XSMT  | +3V3            |
 
 //% CHIPS: esp32 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
-//% FEATURES: embassy-generic-timers
 
 #![no_std]
 #![no_main]