mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-23 20:22:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup common code and clippy fixes

Browse source
This commit is contained in:
Emil Fresk 2023-01-31 22:05:43 +01:00 committed by Henrik Tjäder
parent 15d788b7fa
commit d0c5126960
3 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rtic-channel/src/lib.rs
View file

@ -142,8 +142,8 @@ where
{ {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
match self { match self {
TrySendError::NoReceiver(v) => write!(f, "NoReceiver({:?})", v), TrySendError::NoReceiver(v) => write!(f, "NoReceiver({v:?})"),
TrySendError::Full(v) => write!(f, "Full({:?})", v), TrySendError::Full(v) => write!(f, "Full({v:?})"),
} }
} }
} }
@ -401,12 +401,10 @@ impl<'a, T, const N: usize> Receiver<'a, T, N> {
} }
Ok(r) Ok(r)
} else if self.is_closed() {
Err(ReceiveError::NoSender)
} else { } else {
if self.is_closed() { Err(ReceiveError::Empty)
Err(ReceiveError::NoSender)
} else {
Err(ReceiveError::Empty)
}
} }
} }

1
rtic-time/Cargo.toml
View file

@ -8,3 +8,4 @@ edition = "2021"
[dependencies] [dependencies]
critical-section = "1" critical-section = "1"
futures-util = { version = "0.3.25", default-features = false } futures-util = { version = "0.3.25", default-features = false }
rtic-common = { version = "1.0.0", path = "../rtic-common" }

27
rtic-time/src/lib.rs
View file

@ -14,13 +14,13 @@ use futures_util::{
future::{select, Either}, future::{select, Either},
pin_mut, pin_mut,
}; };
use linked_list::{Link, LinkedList};
pub use monotonic::Monotonic; pub use monotonic::Monotonic;
use rtic_common::dropper::OnDrop;
mod linked_list; mod linked_list;
mod monotonic; mod monotonic;
use linked_list::{Link, LinkedList};
/// Holds a waker and at which time instant this waker shall be awoken. /// Holds a waker and at which time instant this waker shall be awoken.
struct WaitingWaker<Mono: Monotonic> { struct WaitingWaker<Mono: Monotonic> {
waker: Waker, waker: Waker,
@ -264,26 +264,3 @@ impl<Mono: Monotonic> TimerQueue<Mono> {
} }
} }
} }
struct OnDrop<F: FnOnce()> {
f: core::mem::MaybeUninit<F>,
}
impl<F: FnOnce()> OnDrop<F> {
pub fn new(f: F) -> Self {
Self {
f: core::mem::MaybeUninit::new(f),
}
}
#[allow(unused)]
pub fn defuse(self) {
core::mem::forget(self)
}
}
impl<F: FnOnce()> Drop for OnDrop<F> {
fn drop(&mut self) {
unsafe { self.f.as_ptr().read()() }
}
}