diff --git a/ector/Cargo.toml b/ector/Cargo.toml index c8e7221..61ad886 100644 --- a/ector/Cargo.toml +++ b/ector/Cargo.toml @@ -15,7 +15,7 @@ exclude = [".github"] doctest = false [dependencies] -embassy-executor = { version = "0.6", default-features = false } +embassy-executor = { version = "0.7", default-features = false } embassy-sync = { version = "0.6", default-features = false } portable-atomic = { version = "1.3", default-features = false } @@ -28,12 +28,11 @@ static_cell = "2.1" [dev-dependencies] -embassy-executor = { version = "0.6.0", default-features = false, features = [ - "integrated-timers", +embassy-executor = { version = "0.7", default-features = false, features = [ "arch-std", "executor-thread", ] } -embassy-time = { version = "0.3.2", default-features = false, features = [ +embassy-time = { version = "0.4", default-features = false, features = [ "std", ] } futures = { version = "0.3.31", default-features = false, features = [ @@ -45,7 +44,6 @@ ector = { path = ".", features = ["std", "log", "time", "test-utils"] } [features] default = ["std", "log", "time"] std = [ - "embassy-executor/integrated-timers", "embassy-executor/arch-std", "embassy-time/std", "critical-section/std", diff --git a/ector/src/actor.rs b/ector/src/actor.rs index 8be7e25..51a440b 100644 --- a/ector/src/actor.rs +++ b/ector/src/actor.rs @@ -64,7 +64,7 @@ pub trait ActorRequest { async fn request(&self, message: M) -> R; } -impl<'a, M> ActorAddress for DynamicSender<'a, M> { +impl ActorAddress for DynamicSender<'_, M> { fn try_notify(&self, message: M) -> Result<(), M> { self.try_send(message).map_err(|e| match e { TrySendError::Full(m) => m, @@ -76,7 +76,7 @@ impl<'a, M> ActorAddress for DynamicSender<'a, M> { } } -impl<'a, M, R> ActorRequest for DynamicSender<'a, Request> { +impl ActorRequest for DynamicSender<'_, Request> { async fn request(&self, message: M) -> R { let channel: Channel = Channel::new(); let sender: DynamicSender<'_, R> = channel.sender().into(); @@ -99,7 +99,7 @@ impl<'a, M, R> ActorRequest for DynamicSender<'a, Request> { } } -impl<'a, M, MUT, const N: usize> ActorAddress for Sender<'a, MUT, M, N> +impl ActorAddress for Sender<'_, MUT, M, N> where MUT: RawMutex, { @@ -114,7 +114,7 @@ where } } -impl<'a, M, R, MUT, const N: usize> ActorRequest for Sender<'a, MUT, Request, N> +impl ActorRequest for Sender<'_, MUT, Request, N> where M: 'static, MUT: RawMutex + 'static,