diff --git a/rtic-arbiter/src/lib.rs b/rtic-arbiter/src/lib.rs index 519ce2cd34..09d1b2eea3 100644 --- a/rtic-arbiter/src/lib.rs +++ b/rtic-arbiter/src/lib.rs @@ -82,7 +82,7 @@ impl Arbiter { // which happens outside this `poll_fn`'s stack frame. let link = unsafe { link_ptr.get() }; if let Some(link) = link { - if link.is_poped() { + if link.is_popped() { return Poll::Ready(()); } } else { diff --git a/rtic-channel/src/lib.rs b/rtic-channel/src/lib.rs index 3cee78be5c..fef546b357 100644 --- a/rtic-channel/src/lib.rs +++ b/rtic-channel/src/lib.rs @@ -267,7 +267,7 @@ impl<'a, T, const N: usize> Sender<'a, T, N> { // which happens outside this `poll_fn`'s stack frame. let link = unsafe { link_ptr.get() }; if let Some(link) = link { - if !link.is_poped() { + if !link.is_popped() { return None; } else { // Fall through to dequeue diff --git a/rtic-common/src/wait_queue.rs b/rtic-common/src/wait_queue.rs index ba8ff5471a..4ced6ab9ae 100644 --- a/rtic-common/src/wait_queue.rs +++ b/rtic-common/src/wait_queue.rs @@ -58,7 +58,7 @@ impl LinkedList { // Clear the pointers in the node. head_ref.next.store(null_mut(), Self::R); head_ref.prev.store(null_mut(), Self::R); - head_ref.is_poped.store(true, Self::R); + head_ref.is_popped.store(true, Self::R); return Some(head_val); } @@ -102,7 +102,7 @@ pub struct Link { pub(crate) val: T, next: AtomicPtr>, prev: AtomicPtr>, - is_poped: AtomicBool, + is_popped: AtomicBool, _up: PhantomPinned, } @@ -115,14 +115,14 @@ impl Link { val, next: AtomicPtr::new(null_mut()), prev: AtomicPtr::new(null_mut()), - is_poped: AtomicBool::new(false), + is_popped: AtomicBool::new(false), _up: PhantomPinned, } } /// Return true if this link has been poped from the list. - pub fn is_poped(&self) -> bool { - self.is_poped.load(Self::R) + pub fn is_popped(&self) -> bool { + self.is_popped.load(Self::R) } /// Remove this link from a linked list. @@ -133,7 +133,7 @@ impl Link { let prev = self.prev.load(Self::R); let next = self.next.load(Self::R); - self.is_poped.store(true, Self::R); + self.is_popped.store(true, Self::R); match unsafe { (prev.as_ref(), next.as_ref()) } { (None, None) => {