diff options
| author | Dario Nieuwenhuis <[email protected]> | 2025-06-16 12:38:47 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-06-16 12:38:47 +0000 |
| commit | dda17cc7cb85e3818d43561102b1fc6358d059c5 (patch) | |
| tree | 7508b417ffdefaa86b4afddba669d46c8d74f3fc /embassy-sync | |
| parent | 56572ef0adffd6258adc10fb424e37a8b4ddc19c (diff) | |
| parent | a0d17ea5ca0bd76ef4d4398c28bc8f98c4e50065 (diff) | |
Merge pull request #4309 from bugadani/futures
Remove futures-util where unnecessary
Diffstat (limited to 'embassy-sync')
| -rw-r--r-- | embassy-sync/Cargo.toml | 2 | ||||
| -rw-r--r-- | embassy-sync/src/channel.rs | 4 | ||||
| -rw-r--r-- | embassy-sync/src/pubsub/subscriber.rs | 2 |
3 files changed, 4 insertions, 4 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 } | |||
| 28 | log = { version = "0.4.14", optional = true } | 28 | log = { version = "0.4.14", optional = true } |
| 29 | 29 | ||
| 30 | futures-sink = { version = "0.3", default-features = false, features = [] } | 30 | futures-sink = { version = "0.3", default-features = false, features = [] } |
| 31 | futures-util = { version = "0.3.17", default-features = false } | 31 | futures-core = { version = "0.3.31", default-features = false } |
| 32 | critical-section = "1.1" | 32 | critical-section = "1.1" |
| 33 | heapless = "0.8" | 33 | heapless = "0.8" |
| 34 | cfg-if = "1.0.0" | 34 | 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 | |||
| 443 | } | 443 | } |
| 444 | } | 444 | } |
| 445 | 445 | ||
| 446 | impl<'ch, M, T, const N: usize> futures_util::Stream for Receiver<'ch, M, T, N> | 446 | impl<'ch, M, T, const N: usize> futures_core::Stream for Receiver<'ch, M, T, N> |
| 447 | where | 447 | where |
| 448 | M: RawMutex, | 448 | M: RawMutex, |
| 449 | { | 449 | { |
| @@ -962,7 +962,7 @@ where | |||
| 962 | } | 962 | } |
| 963 | } | 963 | } |
| 964 | 964 | ||
| 965 | impl<M, T, const N: usize> futures_util::Stream for Channel<M, T, N> | 965 | impl<M, T, const N: usize> futures_core::Stream for Channel<M, T, N> |
| 966 | where | 966 | where |
| 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. |
| 118 | impl<'a, PSB: PubSubBehavior<T> + ?Sized, T: Clone> futures_util::Stream for Sub<'a, PSB, T> { | 118 | impl<'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>> { |
