From f2643a00764955138f88943b7f40c12a16ef4740 Mon Sep 17 00:00:00 2001 From: Yandrik Date: Wed, 15 Mar 2023 14:33:29 +0100 Subject: fix(rtic-sync): used fully qualified paths in Channel Macro --- rtic-sync/src/channel.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rtic-sync') diff --git a/rtic-sync/src/channel.rs b/rtic-sync/src/channel.rs index 8a817c8..aad0280 100644 --- a/rtic-sync/src/channel.rs +++ b/rtic-sync/src/channel.rs @@ -102,7 +102,7 @@ impl Channel { #[macro_export] macro_rules! make_channel { ($type:path, $size:expr) => {{ - static mut CHANNEL: Channel<$type, $size> = Channel::new(); + static mut CHANNEL: ::rtic_sync::channel::Channel<$type, $size> = ::rtic_sync::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. -- cgit v1.2.3 From 15b9db4c5d60f8cc7c192261ad01b1ebf74faa83 Mon Sep 17 00:00:00 2001 From: Yandrik Date: Wed, 15 Mar 2023 15:18:31 +0100 Subject: refactor: re-formatted channel.rs file --- rtic-sync/src/channel.rs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'rtic-sync') diff --git a/rtic-sync/src/channel.rs b/rtic-sync/src/channel.rs index aad0280..ee5ea9c 100644 --- a/rtic-sync/src/channel.rs +++ b/rtic-sync/src/channel.rs @@ -38,6 +38,7 @@ pub struct Channel { } unsafe impl Send for Channel {} + unsafe impl Sync for Channel {} struct UnsafeAccess<'a, const N: usize> { @@ -124,8 +125,8 @@ pub enum TrySendError { } impl core::fmt::Debug for NoReceiver -where - T: core::fmt::Debug, + where + T: core::fmt::Debug, { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { write!(f, "NoReceiver({:?})", self.0) @@ -133,8 +134,8 @@ where } impl core::fmt::Debug for TrySendError -where - T: core::fmt::Debug, + where + T: core::fmt::Debug, { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { match self { @@ -145,8 +146,8 @@ where } impl PartialEq for TrySendError -where - T: PartialEq, + where + T: PartialEq, { fn eq(&self, other: &Self) -> bool { match (self, other) { @@ -176,6 +177,7 @@ impl LinkPtr { } unsafe impl Send for LinkPtr {} + unsafe impl Sync for LinkPtr {} impl<'a, T, const N: usize> core::fmt::Debug for Sender<'a, T, N> { @@ -299,7 +301,7 @@ impl<'a, T, const N: usize> Sender<'a, T, N> { Poll::Pending } }) - .await; + .await; // Make sure the link is removed from the queue. drop(dropper); @@ -429,7 +431,7 @@ impl<'a, T, const N: usize> Receiver<'a, T, N> { Poll::Pending }) - .await + .await } /// Returns true if there are no `Sender`s. -- cgit v1.2.3 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-sync/src/channel.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rtic-sync') diff --git a/rtic-sync/src/channel.rs b/rtic-sync/src/channel.rs index ee5ea9c..d0670c2 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. -- 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-sync/src/channel.rs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'rtic-sync') diff --git a/rtic-sync/src/channel.rs b/rtic-sync/src/channel.rs index d0670c2..b7b5a48 100644 --- a/rtic-sync/src/channel.rs +++ b/rtic-sync/src/channel.rs @@ -103,7 +103,8 @@ impl Channel { #[macro_export] macro_rules! make_channel { ($type:path, $size:expr) => {{ - static mut CHANNEL: $crate::channel::Channel<$type, $size> = $crate::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. @@ -125,8 +126,8 @@ pub enum TrySendError { } impl core::fmt::Debug for NoReceiver - where - T: core::fmt::Debug, +where + T: core::fmt::Debug, { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { write!(f, "NoReceiver({:?})", self.0) @@ -134,8 +135,8 @@ impl core::fmt::Debug for NoReceiver } impl core::fmt::Debug for TrySendError - where - T: core::fmt::Debug, +where + T: core::fmt::Debug, { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { match self { @@ -146,8 +147,8 @@ impl core::fmt::Debug for TrySendError } impl PartialEq for TrySendError - where - T: PartialEq, +where + T: PartialEq, { fn eq(&self, other: &Self) -> bool { match (self, other) { @@ -301,7 +302,7 @@ impl<'a, T, const N: usize> Sender<'a, T, N> { Poll::Pending } }) - .await; + .await; // Make sure the link is removed from the queue. drop(dropper); @@ -431,7 +432,7 @@ impl<'a, T, const N: usize> Receiver<'a, T, N> { Poll::Pending }) - .await + .await } /// Returns true if there are no `Sender`s. -- cgit v1.2.3