aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2025-06-16 12:38:47 +0000
committerGitHub <[email protected]>2025-06-16 12:38:47 +0000
commitdda17cc7cb85e3818d43561102b1fc6358d059c5 (patch)
tree7508b417ffdefaa86b4afddba669d46c8d74f3fc
parent56572ef0adffd6258adc10fb424e37a8b4ddc19c (diff)
parenta0d17ea5ca0bd76ef4d4398c28bc8f98c4e50065 (diff)
Merge pull request #4309 from bugadani/futures
Remove futures-util where unnecessary
-rw-r--r--embassy-sync/Cargo.toml2
-rw-r--r--embassy-sync/src/channel.rs4
-rw-r--r--embassy-sync/src/pubsub/subscriber.rs2
-rw-r--r--embassy-time/Cargo.toml2
-rw-r--r--embassy-time/src/timer.rs4
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 }
28log = { version = "0.4.14", optional = true } 28log = { version = "0.4.14", optional = true }
29 29
30futures-sink = { version = "0.3", default-features = false, features = [] } 30futures-sink = { version = "0.3", default-features = false, features = [] }
31futures-util = { version = "0.3.17", default-features = false } 31futures-core = { version = "0.3.31", default-features = false }
32critical-section = "1.1" 32critical-section = "1.1"
33heapless = "0.8" 33heapless = "0.8"
34cfg-if = "1.0.0" 34cfg-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
443 } 443 }
444} 444}
445 445
446impl<'ch, M, T, const N: usize> futures_util::Stream for Receiver<'ch, M, T, N> 446impl<'ch, M, T, const N: usize> futures_core::Stream for Receiver<'ch, M, T, N>
447where 447where
448 M: RawMutex, 448 M: RawMutex,
449{ 449{
@@ -962,7 +962,7 @@ where
962 } 962 }
963} 963}
964 964
965impl<M, T, const N: usize> futures_util::Stream for Channel<M, T, N> 965impl<M, T, const N: usize> futures_core::Stream for Channel<M, T, N>
966where 966where
967 M: RawMutex, 967 M: RawMutex,
968{ 968{
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<T> + ?Sized, T: Clone> Unpin for Sub<'a, PSB, T> {}
115 115
116/// Warning: The stream implementation ignores lag results and returns all messages. 116/// Warning: The stream implementation ignores lag results and returns all messages.
117/// This might miss some messages without you knowing it. 117/// This might miss some messages without you knowing it.
118impl<'a, PSB: PubSubBehavior<T> + ?Sized, T: Clone> futures_util::Stream for Sub<'a, PSB, T> { 118impl<'a, PSB: PubSubBehavior<T> + ?Sized, T: Clone> futures_core::Stream for Sub<'a, PSB, T> {
119 type Item = T; 119 type Item = T;
120 120
121 fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> { 121 fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
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" }
427embedded-hal-1 = { package = "embedded-hal", version = "1.0" } 427embedded-hal-1 = { package = "embedded-hal", version = "1.0" }
428embedded-hal-async = { version = "1.0" } 428embedded-hal-async = { version = "1.0" }
429 429
430futures-util = { version = "0.3.17", default-features = false } 430futures-core = { version = "0.3.31", default-features = false }
431critical-section = "1.1" 431critical-section = "1.1"
432cfg-if = "1.0.0" 432cfg-if = "1.0.0"
433 433
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};
2use core::pin::Pin; 2use core::pin::Pin;
3use core::task::{Context, Poll}; 3use core::task::{Context, Poll};
4 4
5use futures_util::stream::FusedStream; 5use futures_core::stream::FusedStream;
6use futures_util::Stream; 6use futures_core::Stream;
7 7
8use crate::{Duration, Instant}; 8use crate::{Duration, Instant};
9 9