From a0d17ea5ca0bd76ef4d4398c28bc8f98c4e50065 Mon Sep 17 00:00:00 2001 From: Dániel Buga Date: Mon, 16 Jun 2025 13:57:19 +0200 Subject: Remove futures-util where unnecessary --- embassy-sync/Cargo.toml | 2 +- embassy-sync/src/channel.rs | 4 ++-- embassy-sync/src/pubsub/subscriber.rs | 2 +- embassy-time/Cargo.toml | 2 +- embassy-time/src/timer.rs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/embassy-sync/Cargo.toml b/embassy-sync/Cargo.toml index 99962f9f6..1e2ea8ea1 100644 --- a/embassy-sync/Cargo.toml +++ b/embassy-sync/Cargo.toml @@ -28,7 +28,7 @@ defmt = { version = "1.0.1", optional = true } log = { version = "0.4.14", optional = true } futures-sink = { version = "0.3", default-features = false, features = [] } -futures-util = { version = "0.3.17", default-features = false } +futures-core = { version = "0.3.31", default-features = false } critical-section = "1.1" heapless = "0.8" cfg-if = "1.0.0" diff --git a/embassy-sync/src/channel.rs b/embassy-sync/src/channel.rs index 856551417..dda91c651 100644 --- a/embassy-sync/src/channel.rs +++ b/embassy-sync/src/channel.rs @@ -443,7 +443,7 @@ where } } -impl<'ch, M, T, const N: usize> futures_util::Stream for Receiver<'ch, M, T, N> +impl<'ch, M, T, const N: usize> futures_core::Stream for Receiver<'ch, M, T, N> where M: RawMutex, { @@ -962,7 +962,7 @@ where } } -impl futures_util::Stream for Channel +impl futures_core::Stream for Channel where M: RawMutex, { diff --git a/embassy-sync/src/pubsub/subscriber.rs b/embassy-sync/src/pubsub/subscriber.rs index 6ad660cb3..649382cf1 100644 --- a/embassy-sync/src/pubsub/subscriber.rs +++ b/embassy-sync/src/pubsub/subscriber.rs @@ -115,7 +115,7 @@ impl<'a, PSB: PubSubBehavior + ?Sized, T: Clone> Unpin for Sub<'a, PSB, T> {} /// Warning: The stream implementation ignores lag results and returns all messages. /// This might miss some messages without you knowing it. -impl<'a, PSB: PubSubBehavior + ?Sized, T: Clone> futures_util::Stream for Sub<'a, PSB, T> { +impl<'a, PSB: PubSubBehavior + ?Sized, T: Clone> futures_core::Stream for Sub<'a, PSB, T> { type Item = T; fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { diff --git a/embassy-time/Cargo.toml b/embassy-time/Cargo.toml index 76983d880..2284906b0 100644 --- a/embassy-time/Cargo.toml +++ b/embassy-time/Cargo.toml @@ -427,7 +427,7 @@ embedded-hal-02 = { package = "embedded-hal", version = "0.2.6" } embedded-hal-1 = { package = "embedded-hal", version = "1.0" } embedded-hal-async = { version = "1.0" } -futures-util = { version = "0.3.17", default-features = false } +futures-core = { version = "0.3.31", default-features = false } critical-section = "1.1" cfg-if = "1.0.0" diff --git a/embassy-time/src/timer.rs b/embassy-time/src/timer.rs index d1162eadd..d3f1e1621 100644 --- a/embassy-time/src/timer.rs +++ b/embassy-time/src/timer.rs @@ -2,8 +2,8 @@ use core::future::{poll_fn, Future}; use core::pin::Pin; use core::task::{Context, Poll}; -use futures_util::stream::FusedStream; -use futures_util::Stream; +use futures_core::stream::FusedStream; +use futures_core::Stream; use crate::{Duration, Instant}; -- cgit