From a071ab05b2bb443672c0c21386522d5ebcbcb63a Mon Sep 17 00:00:00 2001 From: Yandrik Date: Wed, 15 Mar 2023 20:04:27 +0100 Subject: [PATCH] refactor(macro): used $crate for better interop --- rtic-monotonics/src/rp2040.rs | 4 ++-- rtic-monotonics/src/systick.rs | 4 ++-- rtic-sync/src/channel.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rtic-monotonics/src/rp2040.rs b/rtic-monotonics/src/rp2040.rs index 93472e6d39..9b66bca059 100644 --- a/rtic-monotonics/src/rp2040.rs +++ b/rtic-monotonics/src/rp2040.rs @@ -144,12 +144,12 @@ macro_rules! make_rp2040_monotonic_handler { #[no_mangle] #[allow(non_snake_case)] unsafe extern "C" fn TIMER_IRQ_0() { - rtic_monotonics::rp2040::Timer::__tq().on_monotonic_interrupt(); + $crate::rp2040::Timer::__tq().on_monotonic_interrupt(); } pub struct Rp2040Token; - unsafe impl rtic_monotonics::InterruptToken + unsafe impl $crate::InterruptToken for Rp2040Token { } diff --git a/rtic-monotonics/src/systick.rs b/rtic-monotonics/src/systick.rs index feefc7ea05..85184dbda1 100644 --- a/rtic-monotonics/src/systick.rs +++ b/rtic-monotonics/src/systick.rs @@ -162,12 +162,12 @@ macro_rules! make_systick_handler { #[no_mangle] #[allow(non_snake_case)] unsafe extern "C" fn SysTick() { - rtic_monotonics::systick::Systick::__tq().on_monotonic_interrupt(); + $crate::systick::Systick::__tq().on_monotonic_interrupt(); } pub struct SystickToken; - unsafe impl rtic_monotonics::InterruptToken + unsafe impl $crate::InterruptToken for SystickToken { } diff --git a/rtic-sync/src/channel.rs b/rtic-sync/src/channel.rs index ee5ea9c183..d0670c2df6 100644 --- a/rtic-sync/src/channel.rs +++ b/rtic-sync/src/channel.rs @@ -103,7 +103,7 @@ impl Channel { #[macro_export] macro_rules! make_channel { ($type:path, $size:expr) => {{ - static mut CHANNEL: ::rtic_sync::channel::Channel<$type, $size> = ::rtic_sync::channel::Channel::new(); + static mut CHANNEL: $crate::channel::Channel<$type, $size> = $crate::channel::Channel::new(); // SAFETY: This is safe as we hide the static mut from others to access it. // Only this point is where the mutable access happens.