Remove prelude (#2845)

* Remove prelude

* Changelog

esp-hal-embassy/src/time_driver.rs

@@ -3,9 +3,8 @@ use core::cell::Cell;
 use embassy_time_driver::{AlarmHandle, Driver};
 use esp_hal::{
     interrupt::{InterruptHandler, Priority},
-    prelude::*,
     sync::Locked,
-    time::now,
+    time::{now, ExtU64},
     timer::{AnyTimer, OneShotTimer},
     Blocking,
 };

esp-hal/CHANGELOG.md

@@ -51,6 +51,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `gpio::{GpioPin, AnyPin, Io, Output, OutputOpenDrain, Input, Flex}` now implement `Debug`, `defmt::Format` (#2842)
 - More interrupts are available in `esp_hal::spi::master::SpiInterrupt`, add `enable_listen`,`interrupts` and `clear_interrupts` for ESP32/ESP32-S2 (#2833)
 
+- The `ExtU64` and `RateExtU32` traits have been added to `esp_hal::time` (#2845)
+
 ### Changed
 
 - Bump MSRV to 1.83 (#2615)
@@ -106,6 +108,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed `Camera::set_` functions (#2610)
 - `DmaTxBuf::{compute_chunk_size, compute_descriptor_count, new_with_block_size}` (#2543)
 
+- The `prelude` module has been removed (#2845)
+
 ## [0.22.0] - 2024-11-20
 
 ### Added

esp-hal/MIGRATING-0.22.md

@@ -317,3 +317,22 @@ To avoid abbreviations and contractions (as per the esp-hal guidelines), some er
 - Error::InvalidZeroLength
 + Error::ZeroLengthInvalid
 ```
+
+## The crate prelude has been removed
+
+The reexports that were previously part of the prelude are available through other paths:
+
+- `nb` is no longer re-exported. Please import the `nb` crate if you need it.
+- `ExtU64` and `RateExtU32` have been moved to `esp_hal::time`
+- `Clock` and `CpuClock`: `esp_hal::clock::{Clock, CpuClock}`
+- The following traits need to be individually imported when needed:
+    - `esp_hal::analog::dac::Instance`
+    - `esp_hal::gpio::Pin`
+    - `esp_hal::ledc::channel::ChannelHW`
+    - `esp_hal::ledc::channel::ChannelIFace`
+    - `esp_hal::ledc::timer::TimerHW`
+    - `esp_hal::ledc::timer::TimerIFace`
+    - `esp_hal::timer::timg::TimerGroupInstance`
+    - `esp_hal::timer::Timer`
+    - `esp_hal::interrupt::InterruptConfigurable`
+- The `entry` macro can be imported as `esp_hal::entry`, while other macros are found under `esp_hal::macros`

esp-hal/src/clock/mod.rs

@@ -37,6 +37,8 @@
 //! ### Initialize With Different Clock Frequencies
 //! ```rust, no_run
 #![doc = crate::before_snippet!()]
+//! use esp_hal::clock::CpuClock;
+//!
 //! // Initialize with the highest possible frequency for this chip
 //! let config = esp_hal::Config::default().with_cpu_clock(CpuClock::max());
 //! let peripherals = esp_hal::init(config);

esp-hal/src/config.rs

@@ -22,6 +22,8 @@
 //! ### Custom initialization
 //! ```rust, no_run
 #![doc = crate::before_snippet!()]
+//! use esp_hal::clock::CpuClock;
+//!
 //! let config =
 //! esp_hal::Config::default().with_cpu_clock(CpuClock::max()).
 //!     with_watchdog(esp_hal::config::WatchdogConfig::default().

esp-hal/src/i2s/parallel.rs

@@ -43,7 +43,6 @@
 //! # use esp_hal::dma_buffers;
 //! # use esp_hal::delay::Delay;
 //! # use esp_hal::i2s::parallel::{I2sParallel, TxEightBits};
-//! # use esp_hal::prelude::*;
 //!
 //! const BUFFER_SIZE: usize = 256;
 //!

esp-hal/src/lib.rs

@@ -68,9 +68,10 @@
 //! #     loop {}
 //! # }
 //! use esp_hal::{
+//!     clock::CpuClock,
 //!     delay::Delay,
+//!     entry,
 //!     gpio::{Io, Level, Output},
-//!     prelude::*,
 //! };
 //!
 //! #[entry]
@@ -178,7 +179,6 @@ pub mod i2c;
 #[cfg(any(dport, interrupt_core0, interrupt_core1))]
 pub mod interrupt;
 pub mod peripheral;
-pub mod prelude;
 #[cfg(any(hmac, sha))]
 mod reg_access;
 #[cfg(any(spi0, spi1, spi2, spi3))]

esp-hal/src/macros.rs

@@ -13,9 +13,8 @@ macro_rules! before_snippet {
     () => {
         r#"
 # #![no_std]
-# use esp_hal::prelude::*;
 # use procmacros::handler;
-# use esp_hal::interrupt;
+# use esp_hal::{interrupt::{self, InterruptConfigurable}, time::{RateExtU32 as _, ExtU64 as _}};
 # macro_rules! println {
 #     ($($tt:tt)*) => { };
 # }

esp-hal/src/mcpwm/operator.rs

@@ -453,7 +453,6 @@ impl<PWM: PwmPeripheral, const OP: u8, const IS_A: bool> embedded_hal::pwm::SetD
 ///
 /// ```rust, no_run
 #[doc = crate::before_snippet!()]
-/// # use esp_hal::{mcpwm, prelude::*};
 /// # use esp_hal::mcpwm::{McPwm, PeripheralClockConfig};
 /// # use esp_hal::mcpwm::operator::{DeadTimeCfg, PwmPinConfig, PWMStream};
 /// // active high complementary using PWMA input

esp-hal/src/prelude.rs

@@ -1,40 +0,0 @@
-//! # The `esp-hal` Prelude
-//!
-//! ## Overview
-//! The prelude is the list of things that `esp-hal` automatically imports into
-//! every program. It’s kept as small as possible, and is focused on
-//! things, particularly traits, which are used in almost every single Rust
-//! program.
-
-pub use imp::*;
-
-#[doc(hidden)]
-mod imp {
-    #[doc(hidden)]
-    pub use fugit::{ExtU64 as _, RateExtU32 as _};
-    #[doc(hidden)]
-    pub use nb;
-
-    #[cfg(dac)]
-    pub use crate::analog::dac::Instance as _esp_hal_analog_dac_Instance;
-    #[cfg(any(dport, pcr, system))]
-    pub use crate::clock::Clock as _esp_hal_clock_Clock;
-    #[cfg(gpio)]
-    pub use crate::gpio::Pin as _esp_hal_gpio_Pin;
-    #[cfg(ledc)]
-    pub use crate::ledc::{
-        channel::{
-            ChannelHW as _esp_hal_ledc_channel_ChannelHW,
-            ChannelIFace as _esp_hal_ledc_channel_ChannelIFace,
-        },
-        timer::{
-            TimerHW as _esp_hal_ledc_timer_TimerHW,
-            TimerIFace as _esp_hal_ledc_timer_TimerIFace,
-        },
-    };
-    #[cfg(any(timg0, timg1))]
-    pub use crate::timer::timg::TimerGroupInstance as _esp_hal_timer_timg_TimerGroupInstance;
-    #[cfg(any(systimer, timg0, timg1))]
-    pub use crate::timer::Timer as _esp_hal_timer_Timer;
-    pub use crate::{clock::CpuClock, entry, interrupt::InterruptConfigurable, macros::*};
-}

esp-hal/src/rmt.rs

@@ -81,7 +81,6 @@
 #![doc = crate::before_snippet!()]
 //! # use esp_hal::rmt::{PulseCode, Rmt, TxChannel, TxChannelConfig, TxChannelCreator};
 //! # use esp_hal::delay::Delay;
-//! # use esp_hal::prelude::*;
 //!
 //! // Configure frequency based on chip type
 #![cfg_attr(esp32h2, doc = "let freq = 32.MHz();")]
@@ -117,7 +116,6 @@
 #![doc = crate::before_snippet!()]
 //! # use esp_hal::rmt::{PulseCode, Rmt, RxChannel, RxChannelConfig, RxChannelCreator};
 //! # use esp_hal::delay::Delay;
-//! # use esp_hal::prelude::*;
 //! # use esp_hal::gpio::{Level, Output};
 //!
 //! const WIDTH: usize = 80;

esp-hal/src/rng.rs

@@ -42,7 +42,7 @@
 //!
 //! ```rust, no_run
 #![doc = crate::before_snippet!()]
-//! # use esp_hal::{prelude::*, rng::Rng};
+//! # use esp_hal::rng::Rng;
 //!
 //! let mut rng = Rng::new(peripherals.RNG);
 //!

esp-hal/src/rtc_cntl/mod.rs

@@ -23,7 +23,7 @@
 //! ```rust, no_run
 #![doc = crate::before_snippet!()]
 //! # use core::time::Duration;
-//! # use esp_hal::{delay::Delay, prelude::*, rtc_cntl::Rtc};
+//! # use esp_hal::{delay::Delay, rtc_cntl::Rtc};
 //!
 //! let rtc = Rtc::new(peripherals.LPWR);
 //! let delay = Delay::new();
@@ -90,7 +90,7 @@
 //! ```rust, no_run
 #![doc = crate::before_snippet!()]
 //! # use core::time::Duration;
-//! # use esp_hal::{delay::Delay, prelude::*, rtc_cntl::Rtc};
+//! # use esp_hal::{delay::Delay, rtc_cntl::Rtc};
 //!
 //! let rtc = Rtc::new(peripherals.LPWR);
 //! let delay = Delay::new();

esp-hal/src/rtc_cntl/sleep/mod.rs

@@ -55,7 +55,6 @@ pub enum WakeupLevel {
 #[doc = crate::before_snippet!()]
 /// # use core::time::Duration;
 /// # use esp_hal::delay::Delay;
-/// # use esp_hal::prelude::*;
 /// # use esp_hal::rtc_cntl::{reset_reason, sleep::TimerWakeupSource, wakeup_cause, Rtc, SocResetReason};
 /// # use esp_hal::Cpu;
 ///
@@ -104,7 +103,6 @@ pub enum Error {
 #[doc = crate::before_snippet!()]
 /// # use core::time::Duration;
 /// # use esp_hal::delay::Delay;
-/// # use esp_hal::prelude::*;
 /// # use esp_hal::rtc_cntl::{reset_reason, sleep::{Ext0WakeupSource, TimerWakeupSource, WakeupLevel}, wakeup_cause, Rtc, SocResetReason};
 /// # use esp_hal::Cpu;
 /// # use esp_hal::gpio::{Input, Pull};
@@ -155,7 +153,6 @@ impl<'a, P: RtcIoWakeupPinType> Ext0WakeupSource<'a, P> {
 #[doc = crate::before_snippet!()]
 /// # use core::time::Duration;
 /// # use esp_hal::delay::Delay;
-/// # use esp_hal::prelude::*;
 /// # use esp_hal::rtc_cntl::{reset_reason, sleep::{Ext1WakeupSource, TimerWakeupSource, WakeupLevel}, wakeup_cause, Rtc, SocResetReason};
 /// # use esp_hal::Cpu;
 /// # use esp_hal::gpio::{Input, Pull, RtcPin};
@@ -210,7 +207,6 @@ impl<'a, 'b> Ext1WakeupSource<'a, 'b> {
 #[doc = crate::before_snippet!()]
 /// # use core::time::Duration;
 /// # use esp_hal::delay::Delay;
-/// # use esp_hal::prelude::*;
 /// # use esp_hal::rtc_cntl::{reset_reason, sleep::{Ext1WakeupSource, TimerWakeupSource, WakeupLevel}, wakeup_cause, Rtc, SocResetReason};
 /// # use esp_hal::Cpu;
 /// # use esp_hal::gpio::{Input, Pull, RtcPinWithResistors};
@@ -268,7 +264,6 @@ impl<'a, 'b> Ext1WakeupSource<'a, 'b> {
 /// # use core::time::Duration;
 /// # use esp_hal::delay::Delay;
 /// # use esp_hal::gpio::{self, Input, Pull};
-/// # use esp_hal::prelude::*;
 /// # use esp_hal::rtc_cntl::{reset_reason, sleep::{RtcioWakeupSource, TimerWakeupSource, WakeupLevel}, wakeup_cause, Rtc, SocResetReason};
 /// # use esp_hal::Cpu;
 /// # use esp_hal::peripheral::Peripheral;

esp-hal/src/soc/esp32/psram.rs

@@ -22,7 +22,7 @@
 //! # extern crate alloc;
 //! # use alloc::{string::String, vec::Vec};
 //! # use esp_alloc as _;
-//! # use esp_hal::{psram, prelude::*};
+//! # use esp_hal::psram;
 //!
 //! // Initialize PSRAM and add it as a heap memory region
 //! fn init_psram_heap(start: *mut u8, size: usize) {

esp-hal/src/soc/esp32s2/psram.rs

@@ -22,7 +22,7 @@
 //! # extern crate alloc;
 //! # use alloc::{string::String, vec::Vec};
 //! # use esp_alloc as _;
-//! # use esp_hal::{psram, prelude::*};
+//! # use esp_hal::psram;
 //!
 //! // Initialize PSRAM and add it as a heap memory region
 //! fn init_psram_heap(start: *mut u8, size: usize) {

esp-hal/src/soc/esp32s3/psram.rs

@@ -27,7 +27,7 @@
 //! # extern crate alloc;
 //! # use alloc::{string::String, vec::Vec};
 //! # use esp_alloc as _;
-//! # use esp_hal::{psram, prelude::*};
+//! # use esp_hal::psram;
 //!
 //! // Initialize PSRAM and add it as a heap memory region
 //! fn init_psram_heap(start: *mut u8, size: usize) {

esp-hal/src/spi/master.rs

@@ -72,10 +72,9 @@ use crate::{
     clock::Clocks,
     dma::{DmaChannelFor, DmaEligible, DmaRxBuffer, DmaTxBuffer, Rx, Tx},
     gpio::{interconnect::PeripheralOutput, InputSignal, NoPin, OutputSignal},
-    interrupt::InterruptHandler,
+    interrupt::{InterruptConfigurable, InterruptHandler},
     peripheral::{Peripheral, PeripheralRef},
     peripherals::spi2::RegisterBlock,
-    prelude::InterruptConfigurable,
     private,
     private::Sealed,
     spi::AnySpi,

esp-hal/src/time.rs

@@ -2,6 +2,8 @@
 //!
 //! The `time` module offers a way to get the system now.
 
+pub use fugit::{ExtU64, RateExtU32};
+
 /// Represents a duration of time.
 ///
 /// The resolution is 1 microsecond, represented as a 64-bit unsigned integer.

esp-hal/src/timer/systimer.rs

@@ -429,7 +429,7 @@ impl Alarm {
 
             static mut HANDLERS: [Option<extern "C" fn()>; 3] = [None, None, None];
 
-            #[crate::prelude::ram]
+            #[crate::macros::ram]
             unsafe extern "C" fn _handle_interrupt<const CH: u8>() {
                 if unsafe { &*SYSTIMER::PTR }
                     .int_raw()

esp-hal/src/timer/timg.rs

@@ -26,7 +26,8 @@
 //!
 //! ```rust, no_run
 #![doc = crate::before_snippet!()]
-//! # use esp_hal::timer::timg::TimerGroup;
+//! use esp_hal::timer::timg::TimerGroup;
+//! use esp_hal::timer::Timer;
 //!
 //! let timg0 = TimerGroup::new(peripherals.TIMG0);
 //! let timer0 = timg0.timer0;
@@ -49,8 +50,9 @@
 //! ### Watchdog Timer
 //! ```rust, no_run
 #![doc = crate::before_snippet!()]
-//! # use esp_hal::timer::timg::TimerGroup;
-//! # use esp_hal::timer::timg::MwdtStage;
+//! use esp_hal::timer::timg::TimerGroup;
+//! use esp_hal::timer::timg::MwdtStage;
+//! use esp_hal::timer::Timer;
 //!
 //! let timg0 = TimerGroup::new(peripherals.TIMG0);
 //! let mut wdt = timg0.wdt;

esp-hal/src/touch.rs

@@ -29,9 +29,9 @@ use core::marker::PhantomData;
 
 use crate::{
     gpio::TouchPin,
+    interrupt::InterruptConfigurable,
     peripheral::{Peripheral, PeripheralRef},
     peripherals::{RTC_CNTL, SENS, TOUCH},
-    prelude::*,
     private::{Internal, Sealed},
     rtc_cntl::Rtc,
     Async,
@@ -528,7 +528,11 @@ mod asynch {
     };
 
     use super::*;
-    use crate::{asynch::AtomicWaker, macros::ram, prelude::handler, Async};
+    use crate::{
+        asynch::AtomicWaker,
+        macros::{handler, ram},
+        Async,
+    };
 
     const NUM_TOUCH_PINS: usize = 10;
 

esp-hal/src/uart.rs

@@ -125,7 +125,6 @@
 #![doc = crate::before_snippet!()]
 //! # use esp_hal::delay::Delay;
 //! # use esp_hal::uart::{AtCmdConfig, Config, Uart, UartInterrupt};
-//! # use esp_hal::prelude::*;
 //! let delay = Delay::new();
 //!
 //! // Default pins for UART/Serial communication

esp-hal/src/usb_serial_jtag.rs

@@ -73,7 +73,7 @@
 //! ### How to output text using USB Serial/JTAG.
 //! ```rust, no_run
 #![doc = crate::before_snippet!()]
-//! # use esp_hal::{delay::Delay, prelude::*, usb_serial_jtag::UsbSerialJtag, Blocking};
+//! # use esp_hal::{delay::Delay, usb_serial_jtag::UsbSerialJtag, Blocking};
 //!
 //! let delay = Delay::new();
 //!

esp-ieee802154/src/raw.rs

@@ -3,8 +3,8 @@ use core::{cell::RefCell, ptr::addr_of};
 use critical_section::Mutex;
 use esp_hal::{
     interrupt::Priority,
+    macros::handler,
     peripherals::RADIO_CLK,
-    prelude::handler,
     system::{RadioClockController, RadioPeripherals},
 };
 use esp_wifi_sys::include::{

esp-wifi/src/common_adapter/common_adapter_esp32.rs

@@ -4,7 +4,7 @@ use super::phy_init_data::PHY_INIT_DATA_DEFAULT;
 use crate::{
     binary::include::*,
     hal::{
-        prelude::ram,
+        macros::ram,
         system::{RadioClockController, RadioPeripherals},
     },
 };

esp-wifi/src/common_adapter/common_adapter_esp32s2.rs

@@ -4,7 +4,7 @@ use super::phy_init_data::PHY_INIT_DATA_DEFAULT;
 use crate::{
     binary::include::*,
     hal::{
-        prelude::ram,
+        macros::ram,
         system::{RadioClockController, RadioPeripherals},
     },
 };

examples/src/bin/debug_assist.rs

@@ -12,7 +12,12 @@ use core::cell::RefCell;
 
 use critical_section::Mutex;
 use esp_backtrace as _;
-use esp_hal::{assist_debug::DebugAssist, prelude::*};
+use esp_hal::{
+    assist_debug::DebugAssist,
+    entry,
+    interrupt::InterruptConfigurable,
+    macros::handler,
+};
 use esp_println::println;
 
 static DA: Mutex<RefCell<Option<DebugAssist>>> = Mutex::new(RefCell::new(None));

examples/src/bin/dma_extmem2mem.rs

@@ -9,7 +9,7 @@
 use aligned::{Aligned, A64};
 use esp_alloc as _;
 use esp_backtrace as _;
-use esp_hal::{delay::Delay, dma::Mem2Mem, dma_descriptors_chunk_size, prelude::*};
+use esp_hal::{delay::Delay, dma::Mem2Mem, dma_descriptors_chunk_size, entry, time::ExtU64};
 use log::{error, info};
 extern crate alloc;
 

examples/src/bin/dma_mem2mem.rs

@@ -7,7 +7,7 @@
 #![no_main]
 
 use esp_backtrace as _;
-use esp_hal::{delay::Delay, dma::Mem2Mem, dma_buffers, prelude::*};
+use esp_hal::{delay::Delay, dma::Mem2Mem, dma_buffers, entry, time::ExtU64};
 use log::{error, info};
 
 const DATA_SIZE: usize = 1024 * 10;

examples/src/bin/embassy_multicore_interrupt.rs

@@ -19,9 +19,9 @@ use embassy_time::{Duration, Ticker};
 use esp_backtrace as _;
 use esp_hal::{
     cpu_control::{CpuControl, Stack},
+    entry,
     gpio::{Level, Output},
     interrupt::{software::SoftwareInterruptControl, Priority},
-    prelude::*,
     timer::{timg::TimerGroup, AnyTimer},
     Cpu,
 };

examples/src/bin/embassy_rmt_rx.rs

@@ -14,8 +14,8 @@ use embassy_time::{Duration, Timer};
 use esp_backtrace as _;
 use esp_hal::{
     gpio::{Level, Output},
-    prelude::*,
     rmt::{PulseCode, Rmt, RxChannelAsync, RxChannelConfig, RxChannelCreatorAsync},
+    time::RateExtU32,
     timer::timg::TimerGroup,
 };
 use esp_println::{print, println};

examples/src/bin/embassy_rmt_tx.rs

@@ -15,8 +15,8 @@ use embassy_executor::Spawner;
 use embassy_time::{Duration, Timer};
 use esp_backtrace as _;
 use esp_hal::{
-    prelude::*,
     rmt::{PulseCode, Rmt, TxChannelAsync, TxChannelConfig, TxChannelCreatorAsync},
+    time::RateExtU32,
     timer::timg::TimerGroup,
 };
 use esp_println::println;

examples/src/bin/embassy_spi.rs

@@ -24,11 +24,11 @@ use esp_backtrace as _;
 use esp_hal::{
     dma::{DmaRxBuf, DmaTxBuf},
     dma_buffers,
-    prelude::*,
     spi::{
         master::{Config, Spi},
         Mode,
     },
+    time::RateExtU32,
     timer::timg::TimerGroup,
 };
 

examples/src/bin/etm_timer.rs

@@ -11,6 +11,7 @@
 
 use esp_backtrace as _;
 use esp_hal::{
+    entry,
     etm::Etm,
     gpio::{
         etm::{Channels, OutputConfig},
@@ -18,7 +19,7 @@ use esp_hal::{
         Output,
         Pull,
     },
-    prelude::*,
+    time::ExtU64,
     timer::{
         systimer::{etm::Event, SystemTimer},
         PeriodicTimer,

examples/src/bin/flash_read_write.rs

@@ -11,7 +11,7 @@
 
 use embedded_storage::{ReadStorage, Storage};
 use esp_backtrace as _;
-use esp_hal::prelude::*;
+use esp_hal::entry;
 use esp_println::println;
 use esp_storage::FlashStorage;
 

examples/src/bin/gpio_interrupt.rs

@@ -18,9 +18,10 @@ use critical_section::Mutex;
 use esp_backtrace as _;
 use esp_hal::{
     delay::Delay,
+    entry,
     gpio::{Event, Input, Io, Level, Output, Pull},
-    macros::ram,
-    prelude::*,
+    interrupt::InterruptConfigurable,
+    macros::{handler, ram},
 };
 
 static BUTTON: Mutex<RefCell<Option<Input>>> = Mutex::new(RefCell::new(None));

examples/src/bin/hmac.rs

@@ -60,8 +60,8 @@
 
 use esp_backtrace as _;
 use esp_hal::{
+    entry,
     hmac::{Hmac, HmacPurpose, KeyId},
-    prelude::*,
     rng::Rng,
 };
 use esp_println::println;

examples/src/bin/ieee802154_receive_all_frames.rs

@@ -5,7 +5,7 @@
 #![no_main]
 
 use esp_backtrace as _;
-use esp_hal::prelude::*;
+use esp_hal::entry;
 use esp_ieee802154::{Config, Ieee802154};
 use esp_println::println;
 

examples/src/bin/ieee802154_receive_frame.rs

@@ -5,7 +5,7 @@
 #![no_main]
 
 use esp_backtrace as _;
-use esp_hal::prelude::*;
+use esp_hal::entry;
 use esp_ieee802154::{Config, Ieee802154};
 use esp_println::println;
 

examples/src/bin/ieee802154_send_broadcast_frame.rs

@@ -5,7 +5,7 @@
 #![no_main]
 
 use esp_backtrace as _;
-use esp_hal::{delay::Delay, prelude::*};
+use esp_hal::{delay::Delay, entry};
 use esp_ieee802154::{Config, Frame, Ieee802154};
 use esp_println::println;
 use ieee802154::mac::{

examples/src/bin/ieee802154_send_frame.rs

@@ -5,7 +5,7 @@
 #![no_main]
 
 use esp_backtrace as _;
-use esp_hal::{delay::Delay, prelude::*};
+use esp_hal::{delay::Delay, entry};
 use esp_ieee802154::{Config, Frame, Ieee802154};
 use esp_println::println;
 use ieee802154::mac::{

examples/src/bin/ieee802154_sniffer.rs

@@ -10,7 +10,7 @@
 
 use esp_backtrace as _;
 use esp_hal::{
-    prelude::*,
+    entry,
     reset::software_reset,
     uart::{self, Uart},
 };

examples/src/bin/lp_core_basic.rs

@@ -16,9 +16,10 @@
 
 use esp_backtrace as _;
 use esp_hal::{
+    entry,
     gpio::lp_io::LowPowerOutput,
     lp_core::{LpCore, LpCoreWakeupSource},
-    prelude::*,
+    macros::load_lp_code,
 };
 use esp_println::{print, println};
 

examples/src/bin/spi_loopback.rs

@@ -19,12 +19,13 @@
 use esp_backtrace as _;
 use esp_hal::{
     delay::Delay,
+    entry,
     peripheral::Peripheral,
-    prelude::*,
     spi::{
         master::{Config, Spi},
         Mode,
     },
+    time::RateExtU32,
 };
 use esp_println::println;
 

examples/src/bin/spi_loopback_dma_psram.rs

@@ -26,12 +26,13 @@ use esp_backtrace as _;
 use esp_hal::{
     delay::Delay,
     dma::{DmaRxBuf, DmaTxBuf, ExternalBurstConfig},
+    entry,
     peripheral::Peripheral,
-    prelude::*,
     spi::{
         master::{Config, Spi},
         Mode,
     },
+    time::RateExtU32,
 };
 extern crate alloc;
 use log::*;

examples/src/bin/spi_slave_dma.rs

@@ -34,8 +34,8 @@ use esp_backtrace as _;
 use esp_hal::{
     delay::Delay,
     dma_buffers,
+    entry,
     gpio::{Input, Level, Output, Pull},
-    prelude::*,
     spi::{slave::Spi, Mode},
 };
 use esp_println::println;

examples/src/bin/touch.rs

@@ -18,9 +18,10 @@ use critical_section::Mutex;
 use esp_backtrace as _;
 use esp_hal::{
     delay::Delay,
+    entry,
     gpio::GpioPin,
-    macros::ram,
-    prelude::*,
+    interrupt::InterruptConfigurable,
+    macros::{handler, ram},
     rtc_cntl::Rtc,
     touch::{Continuous, Touch, TouchConfig, TouchPad},
     Blocking,

examples/src/bin/twai.rs

@@ -30,7 +30,7 @@ const IS_FIRST_SENDER: bool = true;
 use esp_backtrace as _;
 use esp_hal::{
     delay::Delay,
-    prelude::*,
+    entry,
     twai::{self, filter::SingleStandardFilter, EspTwaiFrame, StandardId, TwaiMode},
 };
 use esp_println::println;

examples/src/bin/usb_serial.rs

@@ -16,8 +16,8 @@ use core::ptr::addr_of_mut;
 
 use esp_backtrace as _;
 use esp_hal::{
+    entry,
     otg_fs::{Usb, UsbBus},
-    prelude::*,
 };
 use usb_device::prelude::{UsbDeviceBuilder, UsbVidPid};
 use usbd_serial::{SerialPort, USB_CLASS_CDC};

examples/src/bin/wifi_80211_tx.rs

@@ -13,7 +13,14 @@ use core::marker::PhantomData;
 
 use esp_alloc as _;
 use esp_backtrace as _;
-use esp_hal::{delay::Delay, prelude::*, rng::Rng, timer::timg::TimerGroup};
+use esp_hal::{
+    clock::CpuClock,
+    delay::Delay,
+    entry,
+    rng::Rng,
+    time::ExtU64,
+    timer::timg::TimerGroup,
+};
 use esp_wifi::{init, wifi};
 use ieee80211::{
     common::{CapabilitiesInformation, FCFFlags},

examples/src/bin/wifi_access_point.rs

@@ -19,7 +19,8 @@ use embedded_io::*;
 use esp_alloc as _;
 use esp_backtrace as _;
 use esp_hal::{
-    prelude::*,
+    clock::CpuClock,
+    entry,
     rng::Rng,
     time::{self, Duration},
     timer::timg::TimerGroup,

examples/src/bin/wifi_access_point_with_sta.rs

@@ -20,7 +20,8 @@ use embedded_io::*;
 use esp_alloc as _;
 use esp_backtrace as _;
 use esp_hal::{
-    prelude::*,
+    clock::CpuClock,
+    entry,
     rng::Rng,
     time::{self, Duration},
     timer::timg::TimerGroup,

examples/src/bin/wifi_bench.rs

@@ -19,8 +19,9 @@ use embedded_io::*;
 use esp_alloc as _;
 use esp_backtrace as _;
 use esp_hal::{
+    clock::CpuClock,
     delay::Delay,
-    prelude::*,
+    entry,
     rng::Rng,
     time::{self, Duration},
     timer::timg::TimerGroup,

examples/src/bin/wifi_ble.rs

@@ -25,8 +25,9 @@ use bleps::{
 use esp_alloc as _;
 use esp_backtrace as _;
 use esp_hal::{
+    clock::CpuClock,
+    entry,
     gpio::{Input, Pull},
-    prelude::*,
     rng::Rng,
     time,
     timer::timg::TimerGroup,

examples/src/bin/wifi_coex.rs

@@ -31,7 +31,8 @@ use embedded_io::*;
 use esp_alloc as _;
 use esp_backtrace as _;
 use esp_hal::{
-    prelude::*,
+    clock::CpuClock,
+    entry,
     rng::Rng,
     time::{self, Duration},
     timer::timg::TimerGroup,

examples/src/bin/wifi_csi.rs

@@ -15,12 +15,7 @@ extern crate alloc;
 use blocking_network_stack::Stack;
 use esp_alloc as _;
 use esp_backtrace as _;
-use esp_hal::{
-    prelude::*,
-    rng::Rng,
-    time::{self},
-    timer::timg::TimerGroup,
-};
+use esp_hal::{clock::CpuClock, entry, rng::Rng, time, timer::timg::TimerGroup};
 use esp_println::println;
 use esp_wifi::{
     init,

examples/src/bin/wifi_dhcp.rs

@@ -19,7 +19,8 @@ use embedded_io::*;
 use esp_alloc as _;
 use esp_backtrace as _;
 use esp_hal::{
-    prelude::*,
+    clock::CpuClock,
+    entry,
     rng::Rng,
     time::{self, Duration},
     timer::timg::TimerGroup,

examples/src/bin/wifi_dhcp_smoltcp_nal.rs

@@ -17,7 +17,8 @@ extern crate alloc;
 use esp_alloc as _;
 use esp_backtrace as _;
 use esp_hal::{
-    prelude::*,
+    clock::CpuClock,
+    entry,
     rng::Rng,
     time::{self, Duration},
     timer::timg::TimerGroup,

examples/src/bin/wifi_embassy_access_point.rs

@@ -30,7 +30,7 @@ use embassy_net::{
 use embassy_time::{Duration, Timer};
 use esp_alloc as _;
 use esp_backtrace as _;
-use esp_hal::{prelude::*, rng::Rng, timer::timg::TimerGroup};
+use esp_hal::{clock::CpuClock, rng::Rng, timer::timg::TimerGroup};
 use esp_println::{print, println};
 use esp_wifi::{
     init,

examples/src/bin/wifi_embassy_access_point_with_sta.rs

@@ -31,7 +31,7 @@ use embassy_net::{
 use embassy_time::{Duration, Timer};
 use esp_alloc as _;
 use esp_backtrace as _;
-use esp_hal::{prelude::*, rng::Rng, timer::timg::TimerGroup};
+use esp_hal::{clock::CpuClock, rng::Rng, timer::timg::TimerGroup};
 use esp_println::{print, println};
 use esp_wifi::{
     init,

examples/src/bin/wifi_embassy_bench.rs

@@ -23,7 +23,7 @@ use embassy_net::{tcp::TcpSocket, Ipv4Address, Stack, StackResources};
 use embassy_time::{with_timeout, Duration, Timer};
 use esp_alloc as _;
 use esp_backtrace as _;
-use esp_hal::{prelude::*, rng::Rng, timer::timg::TimerGroup};
+use esp_hal::{clock::CpuClock, rng::Rng, timer::timg::TimerGroup};
 use esp_println::println;
 use esp_wifi::{
     init,

examples/src/bin/wifi_embassy_ble.rs

@@ -28,8 +28,8 @@ use embassy_executor::Spawner;
 use esp_alloc as _;
 use esp_backtrace as _;
 use esp_hal::{
+    clock::CpuClock,
     gpio::{Input, Pull},
-    prelude::*,
     rng::Rng,
     time,
     timer::timg::TimerGroup,

examples/src/bin/wifi_embassy_dhcp.rs

@@ -18,7 +18,7 @@ use embassy_net::{tcp::TcpSocket, Ipv4Address, Stack, StackResources};
 use embassy_time::{Duration, Timer};
 use esp_alloc as _;
 use esp_backtrace as _;
-use esp_hal::{prelude::*, rng::Rng, timer::timg::TimerGroup};
+use esp_hal::{clock::CpuClock, rng::Rng, timer::timg::TimerGroup};
 use esp_println::println;
 use esp_wifi::{
     init,

examples/src/bin/wifi_embassy_esp_now.rs

@@ -15,7 +15,7 @@ use embassy_futures::select::{select, Either};
 use embassy_time::{Duration, Ticker};
 use esp_alloc as _;
 use esp_backtrace as _;
-use esp_hal::{prelude::*, rng::Rng, timer::timg::TimerGroup};
+use esp_hal::{clock::CpuClock, rng::Rng, timer::timg::TimerGroup};
 use esp_println::println;
 use esp_wifi::{
     esp_now::{PeerInfo, BROADCAST_ADDRESS},

examples/src/bin/wifi_embassy_esp_now_duplex.rs

@@ -15,7 +15,7 @@ use embassy_sync::{blocking_mutex::raw::NoopRawMutex, mutex::Mutex};
 use embassy_time::{Duration, Ticker};
 use esp_alloc as _;
 use esp_backtrace as _;
-use esp_hal::{prelude::*, rng::Rng, timer::timg::TimerGroup};
+use esp_hal::{clock::CpuClock, rng::Rng, timer::timg::TimerGroup};
 use esp_println::println;
 use esp_wifi::{
     esp_now::{EspNowManager, EspNowReceiver, EspNowSender, PeerInfo, BROADCAST_ADDRESS},

examples/src/bin/wifi_embassy_trouble.rs

@@ -18,7 +18,7 @@ use embassy_sync::blocking_mutex::raw::NoopRawMutex;
 use embassy_time::{Duration, Timer};
 use esp_alloc as _;
 use esp_backtrace as _;
-use esp_hal::{prelude::*, rng::Rng, timer::timg::TimerGroup};
+use esp_hal::{clock::CpuClock, rng::Rng, timer::timg::TimerGroup};
 use esp_wifi::{ble::controller::BleConnector, init, EspWifiController};
 use log::*;
 use static_cell::StaticCell;

examples/src/bin/wifi_esp_now.rs

@@ -11,7 +11,8 @@
 use esp_alloc as _;
 use esp_backtrace as _;
 use esp_hal::{
-    prelude::*,
+    clock::CpuClock,
+    entry,
     rng::Rng,
     time::{self, Duration},
     timer::timg::TimerGroup,

examples/src/bin/wifi_sniffer.rs

@@ -19,7 +19,7 @@ use core::cell::RefCell;
 
 use critical_section::Mutex;
 use esp_backtrace as _;
-use esp_hal::{prelude::*, rng::Rng, timer::timg::TimerGroup};
+use esp_hal::{clock::CpuClock, entry, rng::Rng, timer::timg::TimerGroup};
 use esp_println::println;
 use esp_wifi::{init, wifi};
 use ieee80211::{match_frames, mgmt_frame::BeaconFrame};

examples/src/bin/wifi_static_ip.rs

@@ -18,7 +18,8 @@ use embedded_io::*;
 use esp_alloc as _;
 use esp_backtrace as _;
 use esp_hal::{
-    prelude::*,
+    clock::CpuClock,
+    entry,
     rng::Rng,
     time::{self, Duration},
     timer::timg::TimerGroup,

hil-test/tests/aes.rs

@@ -7,7 +7,7 @@
 
 use esp_hal::{
     aes::{Aes, Mode},
-    prelude::*,
+    clock::CpuClock,
 };
 use hil_test as _;
 

hil-test/tests/ecc.rs

@@ -17,8 +17,8 @@ use elliptic_curve::sec1::ToEncodedPoint;
 #[cfg(feature = "esp32h2")]
 use esp_hal::ecc::WorkMode;
 use esp_hal::{
+    clock::CpuClock,
     ecc::{Ecc, EllipticCurve, Error},
-    prelude::*,
     rng::Rng,
     Blocking,
 };

hil-test/tests/embassy_interrupt_spi_dma.rs

@@ -13,11 +13,11 @@ use esp_hal::{
     dma_buffers,
     interrupt::{software::SoftwareInterruptControl, Priority},
     peripheral::Peripheral,
-    prelude::*,
     spi::{
         master::{Config, Spi},
         Mode,
     },
+    time::RateExtU32,
     timer::AnyTimer,
     Async,
 };

hil-test/tests/embassy_timers_executors.rs

@@ -17,7 +17,7 @@ use esp_hal::{
 };
 use esp_hal::{
     peripherals::Peripherals,
-    prelude::*,
+    time::ExtU64,
     timer::{timg::TimerGroup, OneShotTimer, PeriodicTimer},
 };
 #[cfg(not(feature = "esp32"))]

hil-test/tests/esp_wifi_floats.rs

@@ -10,10 +10,11 @@ use core::cell::RefCell;
 
 use critical_section::Mutex;
 use esp_hal::{
+    clock::CpuClock,
     delay::Delay,
     interrupt::software::{SoftwareInterrupt, SoftwareInterruptControl},
+    macros::handler,
     peripherals::Peripherals,
-    prelude::*,
     rng::Rng,
     timer::timg::TimerGroup,
 };

hil-test/tests/i2s.rs

@@ -16,7 +16,7 @@ use esp_hal::{
     gpio::{AnyPin, NoPin, Pin},
     i2s::master::{DataFormat, I2s, I2sTx, Standard},
     peripherals::I2S0,
-    prelude::*,
+    time::RateExtU32,
     Async,
 };
 use hil_test as _;

hil-test/tests/init.rs

@@ -6,10 +6,11 @@
 #![no_main]
 
 use esp_hal::{
+    clock::CpuClock,
     config::WatchdogStatus,
     delay::Delay,
-    prelude::*,
     rtc_cntl::Rtc,
+    time::ExtU64,
     timer::timg::TimerGroup,
     Config,
 };

hil-test/tests/interrupt.rs

@@ -11,6 +11,7 @@ use core::{arch::asm, cell::RefCell};
 
 use critical_section::Mutex;
 use esp_hal::{
+    clock::CpuClock,
     interrupt::{
         self,
         software::{SoftwareInterrupt, SoftwareInterruptControl},
@@ -18,7 +19,6 @@ use esp_hal::{
         Priority,
     },
     peripherals::Interrupt,
-    prelude::*,
 };
 use hil_test as _;
 

hil-test/tests/lcd_cam_i8080.rs

@@ -18,7 +18,7 @@ use esp_hal::{
         channel::{CtrlMode, EdgeMode},
         Pcnt,
     },
-    prelude::*,
+    time::RateExtU32,
     Blocking,
 };
 use hil_test as _;

hil-test/tests/lcd_cam_i8080_async.rs

@@ -14,7 +14,7 @@ use esp_hal::{
         lcd::i8080::{Command, Config, TxEightBits, I8080},
         LcdCam,
     },
-    prelude::*,
+    time::RateExtU32,
     Async,
 };
 use hil_test as _;

hil-test/tests/parl_io_tx.rs

@@ -26,7 +26,7 @@ use esp_hal::{
         Pcnt,
     },
     peripherals::PARL_IO,
-    prelude::*,
+    time::RateExtU32,
 };
 use hil_test as _;
 

hil-test/tests/parl_io_tx_async.rs

@@ -28,7 +28,7 @@ use esp_hal::{
         Pcnt,
     },
     peripherals::PARL_IO,
-    prelude::*,
+    time::RateExtU32,
 };
 use hil_test as _;
 

hil-test/tests/qspi.rs

@@ -11,12 +11,12 @@ use esp_hal::{
     dma::{DmaRxBuf, DmaTxBuf},
     dma_buffers,
     gpio::{AnyPin, Input, Level, Output, Pull},
-    prelude::*,
     spi::{
         master::{Address, Command, Config, Spi, SpiDma},
         DataMode,
         Mode,
     },
+    time::RateExtU32,
     Blocking,
 };
 use hil_test as _;
@@ -221,11 +221,7 @@ mod tests {
             #[cfg(pcnt)]
             pcnt: peripherals.PCNT,
             dma_channel,
-            gpios: [
-                pin.degrade(),
-                pin_mirror.degrade(),
-                unconnected_pin.degrade(),
-            ],
+            gpios: [pin.into(), pin_mirror.into(), unconnected_pin.into()],
         }
     }
 

hil-test/tests/rmt.rs

@@ -6,8 +6,8 @@
 #![no_main]
 
 use esp_hal::{
-    prelude::*,
     rmt::{PulseCode, Rmt, RxChannel, RxChannelConfig, TxChannel, TxChannelConfig},
+    time::RateExtU32,
 };
 use hil_test as _;
 

hil-test/tests/rsa.rs

@@ -7,7 +7,6 @@
 
 use crypto_bigint::{Uint, U1024, U512};
 use esp_hal::{
-    prelude::*,
     rsa::{
         operand_sizes::*,
         Rsa,

hil-test/tests/rsa_async.rs

@@ -7,7 +7,6 @@
 
 use crypto_bigint::{Uint, U1024, U512};
 use esp_hal::{
-    prelude::*,
     rsa::{
         operand_sizes::*,
         Rsa,

hil-test/tests/sha.rs

@@ -13,7 +13,7 @@ use esp_hal::sha::{Sha384, Sha512};
 #[cfg(any(feature = "esp32s2", feature = "esp32s3"))]
 use esp_hal::sha::{Sha512_224, Sha512_256};
 use esp_hal::{
-    prelude::*,
+    clock::CpuClock,
     rng::Rng,
     sha::{Sha, Sha1, Sha256, ShaAlgorithm, ShaDigest},
 };

hil-test/tests/spi_full_duplex.rs

@@ -15,8 +15,8 @@ use esp_hal::{
     dma_buffers,
     gpio::{Level, NoPin},
     peripheral::Peripheral,
-    prelude::*,
     spi::master::{Config, Spi},
+    time::RateExtU32,
     Blocking,
 };
 #[cfg(pcnt)]

hil-test/tests/spi_half_duplex_read.rs

@@ -9,12 +9,12 @@ use esp_hal::{
     dma::{DmaRxBuf, DmaTxBuf},
     dma_buffers,
     gpio::{Level, Output},
-    prelude::*,
     spi::{
         master::{Address, Command, Config, Spi, SpiDma},
         DataMode,
         Mode,
     },
+    time::RateExtU32,
     Blocking,
 };
 use hil_test as _;

hil-test/tests/spi_half_duplex_write.rs

@@ -10,12 +10,12 @@ use esp_hal::{
     dma_buffers,
     gpio::interconnect::InputSignal,
     pcnt::{channel::EdgeMode, unit::Unit, Pcnt},
-    prelude::*,
     spi::{
         master::{Address, Command, Config, Spi, SpiDma},
         DataMode,
         Mode,
     },
+    time::RateExtU32,
     Blocking,
 };
 use hil_test as _;

hil-test/tests/spi_half_duplex_write_psram.rs

@@ -12,12 +12,12 @@ use esp_hal::{
     dma_descriptors_chunk_size,
     gpio::interconnect::InputSignal,
     pcnt::{channel::EdgeMode, unit::Unit, Pcnt},
-    prelude::*,
     spi::{
         master::{Address, Command, Config, Spi, SpiDma},
         DataMode,
         Mode,
     },
+    time::RateExtU32,
     Blocking,
 };
 use hil_test as _;

hil-test/tests/systimer.rs

@@ -12,7 +12,8 @@ use critical_section::Mutex;
 use embedded_hal::delay::DelayNs;
 use esp_hal::{
     delay::Delay,
-    prelude::*,
+    macros::handler,
+    time::ExtU64,
     timer::{
         systimer::{Alarm, SystemTimer},
         OneShotTimer,

hil-test/tests/twai.rs

@@ -7,7 +7,6 @@
 
 use embedded_can::Frame;
 use esp_hal::{
-    prelude::*,
     twai::{self, filter::SingleStandardFilter, EspTwaiFrame, StandardId, TwaiMode},
     Blocking,
 };

hil-test/tests/uart.rs

@@ -7,7 +7,6 @@
 
 use embedded_hal_nb::serial::{Read, Write};
 use esp_hal::{
-    prelude::*,
     uart::{self, ClockSource, Uart},
     Blocking,
 };

hil-test/tests/uart_regression.rs

@@ -10,7 +10,6 @@
 mod tests {
     use esp_hal::{
         gpio::OutputPin,
-        prelude::*,
         uart::{self, UartRx, UartTx},
     };
     use hil_test as _;

hil-test/tests/uart_tx_rx.rs

@@ -6,7 +6,6 @@
 #![no_main]
 
 use esp_hal::{
-    prelude::*,
     uart::{self, UartRx, UartTx},
     Blocking,
 };

qa-test/src/bin/embassy_executor_benchmark.rs

@@ -15,7 +15,8 @@ use core::{
 use embassy_executor::{raw::TaskStorage, Spawner};
 use esp_backtrace as _;
 use esp_hal::{
-    prelude::*,
+    clock::{Clock, CpuClock},
+    macros::handler,
     time::Duration,
     timer::{systimer::SystemTimer, OneShotTimer},
 };

qa-test/src/bin/embassy_i2c.rs

@@ -21,7 +21,7 @@ use embassy_time::{Duration, Timer};
 use esp_backtrace as _;
 use esp_hal::{
     i2c::master::{Config, I2c},
-    prelude::*,
+    time::RateExtU32,
     timer::timg::TimerGroup,
 };
 use lis3dh_async::{Lis3dh, Range, SlaveAddr};

qa-test/src/bin/embassy_i2c_bmp180_calibration_data.rs

@@ -21,7 +21,7 @@ use embassy_time::{Duration, Timer};
 use esp_backtrace as _;
 use esp_hal::{
     i2c::master::{Config, I2c},
-    prelude::*,
+    time::RateExtU32,
     timer::timg::TimerGroup,
 };
 

qa-test/src/bin/embassy_i2s_read.rs

@@ -22,7 +22,7 @@ use esp_backtrace as _;
 use esp_hal::{
     dma_buffers,
     i2s::master::{DataFormat, I2s, Standard},
-    prelude::*,
+    time::RateExtU32,
     timer::timg::TimerGroup,
 };
 use esp_println::println;