diff --git a/embassy-executor/Cargo.toml b/embassy-executor/Cargo.toml index 3a623e99..54ea1a54 100644 --- a/embassy-executor/Cargo.toml +++ b/embassy-executor/Cargo.toml @@ -49,9 +49,6 @@ turbowakers = [] integrated-timers = ["dep:embassy-time"] -# Trace interrupt invocations with rtos-trace. -rtos-trace-interrupt = ["rtos-trace", "embassy-macros/rtos-trace-interrupt"] - [dependencies] defmt = { version = "0.3", optional = true } log = { version = "0.4.14", optional = true } diff --git a/embassy-executor/src/lib.rs b/embassy-executor/src/lib.rs index f2c86d8e..3b61b4ba 100644 --- a/embassy-executor/src/lib.rs +++ b/embassy-executor/src/lib.rs @@ -44,25 +44,4 @@ pub use spawner::*; /// Implementation details for embassy macros. /// Do not use. Used for macros and HALs only. Not covered by semver guarantees. #[doc(hidden)] -pub mod _export { - #[cfg(feature = "rtos-trace")] - pub use rtos_trace::trace; - - /// Expands the given block of code when `embassy-executor` is compiled with - /// the `rtos-trace-interrupt` feature. - #[doc(hidden)] - #[macro_export] - #[cfg(feature = "rtos-trace-interrupt")] - macro_rules! rtos_trace_interrupt { - ($($tt:tt)*) => { $($tt)* }; - } - - /// Does not expand the given block of code when `embassy-executor` is - /// compiled without the `rtos-trace-interrupt` feature. - #[doc(hidden)] - #[macro_export] - #[cfg(not(feature = "rtos-trace-interrupt"))] - macro_rules! rtos_trace_interrupt { - ($($tt:tt)*) => {}; - } -} +pub mod _export {} diff --git a/embassy-macros/Cargo.toml b/embassy-macros/Cargo.toml index a893cd30..4e94bf83 100644 --- a/embassy-macros/Cargo.toml +++ b/embassy-macros/Cargo.toml @@ -20,6 +20,4 @@ proc-macro2 = "1.0.29" [lib] proc-macro = true -[features] -# Enabling this cause interrupt::take! to require embassy-executor -rtos-trace-interrupt = [] +[features] \ No newline at end of file diff --git a/examples/nrf-rtos-trace/Cargo.toml b/examples/nrf-rtos-trace/Cargo.toml index e30b13f2..e3524deb 100644 --- a/examples/nrf-rtos-trace/Cargo.toml +++ b/examples/nrf-rtos-trace/Cargo.toml @@ -17,7 +17,7 @@ log = [ [dependencies] embassy-sync = { version = "0.4.0", path = "../../embassy-sync" } -embassy-executor = { version = "0.3.3", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "rtos-trace", "rtos-trace-interrupt", "integrated-timers"] } +embassy-executor = { version = "0.3.3", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "rtos-trace", "integrated-timers"] } embassy-time = { version = "0.1.5", path = "../../embassy-time" } embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac"] }