diff options
| -rw-r--r-- | futures/src/lib.rs | 69 | ||||
| -rw-r--r-- | native/src/subscription.rs | 4 | ||||
| -rw-r--r-- | native/src/subscription/events.rs | 9 |
3 files changed, 53 insertions, 29 deletions
diff --git a/futures/src/lib.rs b/futures/src/lib.rs index 01cf5c89..ba7c558b 100644 --- a/futures/src/lib.rs +++ b/futures/src/lib.rs @@ -37,33 +37,58 @@ pub mod time; pub use command::Command; pub use executor::Executor; +pub use platform::*; pub use runtime::Runtime; pub use subscription::Subscription; -/// A boxed static future. -/// -/// - On native platforms, it needs a `Send` requirement. -/// - On the Web platform, it does not need a `Send` requirement. #[cfg(not(target_arch = "wasm32"))] -pub type BoxFuture<T> = futures::future::BoxFuture<'static, T>; +mod platform { + /// A boxed static future. + /// + /// - On native platforms, it needs a `Send` requirement. + /// - On the Web platform, it does not need a `Send` requirement. + pub type BoxFuture<T> = futures::future::BoxFuture<'static, T>; -/// A boxed static future. -/// -/// - On native platforms, it needs a `Send` requirement. -/// - On the Web platform, it does not need a `Send` requirement. -#[cfg(target_arch = "wasm32")] -pub type BoxFuture<T> = futures::future::LocalBoxFuture<'static, T>; + /// A boxed static stream. + /// + /// - On native platforms, it needs a `Send` requirement. + /// - On the Web platform, it does not need a `Send` requirement. + pub type BoxStream<T> = futures::stream::BoxStream<'static, T>; -/// A boxed static stream. -/// -/// - On native platforms, it needs a `Send` requirement. -/// - On the Web platform, it does not need a `Send` requirement. -#[cfg(not(target_arch = "wasm32"))] -pub type BoxStream<T> = futures::stream::BoxStream<'static, T>; + /// Boxes a stream. + /// + /// - On native platforms, it needs a `Send` requirement. + /// - On the Web platform, it does not need a `Send` requirement. + pub fn boxed_stream<T, S>(stream: S) -> BoxStream<T> + where + S: futures::Stream<Item = T> + Send + 'static, + { + futures::stream::StreamExt::boxed(stream) + } +} -/// A boxed static stream. -/// -/// - On native platforms, it needs a `Send` requirement. -/// - On the Web platform, it does not need a `Send` requirement. #[cfg(target_arch = "wasm32")] -pub type BoxStream<T> = futures::stream::LocalBoxStream<'static, T>; +mod platform { + /// A boxed static future. + /// + /// - On native platforms, it needs a `Send` requirement. + /// - On the Web platform, it does not need a `Send` requirement. + pub type BoxFuture<T> = futures::future::LocalBoxFuture<'static, T>; + + /// A boxed static stream. + /// + /// - On native platforms, it needs a `Send` requirement. + /// - On the Web platform, it does not need a `Send` requirement. + pub type BoxStream<T> = futures::stream::LocalBoxStream<'static, T>; + + /// Boxes a stream. + /// + /// - On native platforms, it needs a `Send` requirement. + /// - On the Web platform, it does not need a `Send` requirement. + pub fn boxed_stream<T, S>(stream: S) -> BoxStream<T> + where + S: futures::Stream<Item = T> + 'static, + { + futures::stream::StreamExt::boxed_local(stream) + } +} diff --git a/native/src/subscription.rs b/native/src/subscription.rs index ff954382..2950879c 100644 --- a/native/src/subscription.rs +++ b/native/src/subscription.rs @@ -1,7 +1,7 @@ //! Listen to external events in your application. use crate::event::{self, Event}; use crate::Hasher; -use iced_futures::futures::stream::BoxStream; +use iced_futures::BoxStream; /// A request to listen to external events. /// @@ -21,7 +21,7 @@ pub type Subscription<T> = /// A stream of runtime events. /// /// It is the input of a [`Subscription`] in the native runtime. -pub type EventStream = BoxStream<'static, (Event, event::Status)>; +pub type EventStream = BoxStream<(Event, event::Status)>; /// A native [`Subscription`] tracker. pub type Tracker = diff --git a/native/src/subscription/events.rs b/native/src/subscription/events.rs index f689f3af..ca143bb3 100644 --- a/native/src/subscription/events.rs +++ b/native/src/subscription/events.rs @@ -27,10 +27,9 @@ where self: Box<Self>, event_stream: EventStream, ) -> BoxStream<Self::Output> { - event_stream - .filter_map(move |(event, status)| { - future::ready((self.f)(event, status)) - }) - .boxed() + let stream = event_stream.filter_map(move |(event, status)| { + future::ready((self.f)(event, status)) + }); + iced_futures::boxed_stream(stream) } } |