From a071ab05b2bb443672c0c21386522d5ebcbcb63a Mon Sep 17 00:00:00 2001 From: Yandrik Date: Wed, 15 Mar 2023 20:04:27 +0100 Subject: refactor(macro): used $crate for better interop --- rtic-monotonics/src/systick.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rtic-monotonics/src/systick.rs') diff --git a/rtic-monotonics/src/systick.rs b/rtic-monotonics/src/systick.rs index feefc7e..85184db 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 { } -- cgit v1.2.3 From 28790218c0cd6c6ea421aa691d904ac466059087 Mon Sep 17 00:00:00 2001 From: Yandrik Date: Wed, 15 Mar 2023 20:15:20 +0100 Subject: refactor(macro): changed not-yet-changed crate names to $crate --- rtic-monotonics/src/systick.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rtic-monotonics/src/systick.rs') diff --git a/rtic-monotonics/src/systick.rs b/rtic-monotonics/src/systick.rs index 85184db..a281783 100644 --- a/rtic-monotonics/src/systick.rs +++ b/rtic-monotonics/src/systick.rs @@ -167,7 +167,7 @@ macro_rules! make_systick_handler { pub struct SystickToken; - unsafe impl $crate::InterruptToken + unsafe impl $crate::InterruptToken<$crate::systick::Systick> for SystickToken { } -- cgit v1.2.3 From ef12ae6b04fa57371507e4ab49f49cb51c30ee4c Mon Sep 17 00:00:00 2001 From: Yandrik Date: Wed, 15 Mar 2023 20:17:26 +0100 Subject: refactor: re-formatted files --- rtic-monotonics/src/systick.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'rtic-monotonics/src/systick.rs') diff --git a/rtic-monotonics/src/systick.rs b/rtic-monotonics/src/systick.rs index a281783..b228e20 100644 --- a/rtic-monotonics/src/systick.rs +++ b/rtic-monotonics/src/systick.rs @@ -157,8 +157,7 @@ impl embedded_hal_async::delay::DelayUs for Systick { /// Register the Systick interrupt for the monotonic. #[macro_export] macro_rules! make_systick_handler { - () => { - { + () => {{ #[no_mangle] #[allow(non_snake_case)] unsafe extern "C" fn SysTick() { @@ -167,12 +166,8 @@ macro_rules! make_systick_handler { pub struct SystickToken; - unsafe impl $crate::InterruptToken<$crate::systick::Systick> - for SystickToken - { - } + unsafe impl $crate::InterruptToken<$crate::systick::Systick> for SystickToken {} SystickToken - } - }; + }}; } -- cgit v1.2.3