diff options
Diffstat (limited to 'rtic-sync/src')
| -rw-r--r-- | rtic-sync/src/channel.rs | 8 | ||||
| -rw-r--r-- | rtic-sync/src/unsafecell.rs | 10 |
2 files changed, 7 insertions, 11 deletions
diff --git a/rtic-sync/src/channel.rs b/rtic-sync/src/channel.rs index b2792a2..043d058 100644 --- a/rtic-sync/src/channel.rs +++ b/rtic-sync/src/channel.rs @@ -57,10 +57,10 @@ macro_rules! cs_access { where F: FnOnce(&mut $type) -> R, { - self.$name.with_mut(|v| { - let v = unsafe { &mut *v }; - f(v) - }) + let v = self.$name.get_mut(); + // SAFETY: we have exclusive access due to the critical section. + let v = unsafe { v.deref() }; + f(v) } }; } diff --git a/rtic-sync/src/unsafecell.rs b/rtic-sync/src/unsafecell.rs index e1774f8..e3730d4 100644 --- a/rtic-sync/src/unsafecell.rs +++ b/rtic-sync/src/unsafecell.rs @@ -23,19 +23,15 @@ mod core { pub fn get_mut(&self) -> MutPtr<T> { MutPtr(self.0.get()) } - - pub unsafe fn with_mut<F, R>(&self, f: F) -> R - where - F: FnOnce(*mut T) -> R, - { - f(self.0.get()) - } } pub struct MutPtr<T>(*mut T); impl<T> MutPtr<T> { #[allow(clippy::mut_from_ref)] + /// SAFETY: the caller must guarantee that the contained `*mut T` is not + /// null, and must uphold the same safety requirements as for + /// [`core::primitive::pointer::as_mut`] for the contained `*mut T`. pub unsafe fn deref(&self) -> &mut T { &mut *self.0 } |