mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2025-12-16 21:05:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

rtic-sync: debug_assert and explicitly drop(item).

Browse source
This commit is contained in:
datdenkikniet 2025-03-23 10:40:03 +01:00 • committed by Emil Fresk
parent 7178f08541
commit 9183e2983e
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
rtic-sync/src/channel.rs
View file

@ -104,7 +104,9 @@ impl<T, const N: usize> Channel<T, N> {
/// Clear any remaining items from this `Channel`. /// Clear any remaining items from this `Channel`.
pub fn clear(&mut self) { pub fn clear(&mut self) {
for _ in self.queued_items() {} for item in self.queued_items() {
drop(item);
}
} }
/// Return an iterator over the still-queued items, removing them /// Return an iterator over the still-queued items, removing them
@ -131,7 +133,7 @@ impl<T, const N: usize> Channel<T, N> {
// NOTE: do not `return_free_slot`, as we have mutable // NOTE: do not `return_free_slot`, as we have mutable
// access to this `Channel` and no `Receiver` or `Sender` // access to this `Channel` and no `Receiver` or `Sender`
// exist. // exist.
assert!(!self.inner.freeq.as_mut().is_full()); debug_assert!(!self.inner.freeq.as_mut().is_full());
unsafe { unsafe {
// SAFETY: `freeq` is not ful. // SAFETY: `freeq` is not ful.
self.inner.freeq.as_mut().push_back_unchecked(slot); self.inner.freeq.as_mut().push_back_unchecked(slot);
@ -163,11 +165,10 @@ impl<T, const N: usize> Channel<T, N> {
// Fill free queue // Fill free queue
for idx in 0..N as u8 { for idx in 0..N as u8 {
// NOTE(assert): `split`-ing does not put `freeq` into a known-empty debug_assert!(!freeq.is_full());
// state, so `debug_assert` is not good enough.
assert!(!freeq.is_full());
// SAFETY: This safe as the loop goes from 0 to the capacity of the underlying queue. // SAFETY: This safe as the loop goes from 0 to the capacity of the underlying queue,
// and the queue is cleared beforehand.
unsafe { unsafe {
freeq.push_back_unchecked(idx); freeq.push_back_unchecked(idx);
} }
@ -207,7 +208,7 @@ impl<T, const N: usize> Channel<T, N> {
// SAFETY: `self.freeq` is not called recursively. // SAFETY: `self.freeq` is not called recursively.
unsafe { unsafe {
self.freeq(cs, |freeq| { self.freeq(cs, |freeq| {
assert!(!freeq.is_full()); debug_assert!(!freeq.is_full());
// SAFETY: `freeq` is not full. // SAFETY: `freeq` is not full.
freeq.push_back_unchecked(slot); freeq.push_back_unchecked(slot);
}); });
@ -385,7 +386,7 @@ impl<T, const N: usize> Sender<'_, T, N> {
// SAFETY: `self.0.readyq` is not called recursively. // SAFETY: `self.0.readyq` is not called recursively.
unsafe { unsafe {
self.0.readyq(cs, |readyq| { self.0.readyq(cs, |readyq| {
assert!(!readyq.is_full()); debug_assert!(!readyq.is_full());
// SAFETY: ready is not full. // SAFETY: ready is not full.
readyq.push_back_unchecked(idx); readyq.push_back_unchecked(idx);
}); });
@ -519,7 +520,7 @@ impl<T, const N: usize> Sender<'_, T, N> {
// SAFETY: `self.0.freeq` is not called recursively. // SAFETY: `self.0.freeq` is not called recursively.
unsafe { unsafe {
self.0.freeq(cs, |freeq| { self.0.freeq(cs, |freeq| {
assert!(!freeq.is_empty()); debug_assert!(!freeq.is_empty());
// SAFETY: `freeq` is non-empty // SAFETY: `freeq` is non-empty
let slot = freeq.pop_back_unchecked(); let slot = freeq.pop_back_unchecked();
Poll::Ready(Ok(slot)) Poll::Ready(Ok(slot))