diff options
author | 2022-01-28 17:35:47 +0700 | |
---|---|---|
committer | 2022-01-28 21:37:17 +0700 | |
commit | 5dab5a327ef643ee38ac3e42ab35212fff445631 (patch) | |
tree | f3b9f2e64a538f250e4785677f7985bd11e4ed3b /futures/src/runtime.rs | |
parent | 83c649b574d90667d23c8430baaebcd0ef933055 (diff) | |
download | iced-5dab5a327ef643ee38ac3e42ab35212fff445631.tar.gz iced-5dab5a327ef643ee38ac3e42ab35212fff445631.tar.bz2 iced-5dab5a327ef643ee38ac3e42ab35212fff445631.zip |
Introduce `MaybeSend` trait in `iced_futures`
It allows to clean up all the `trait_aliases` modules!
Diffstat (limited to 'futures/src/runtime.rs')
-rw-r--r-- | futures/src/runtime.rs | 56 |
1 files changed, 8 insertions, 48 deletions
diff --git a/futures/src/runtime.rs b/futures/src/runtime.rs index 96104cd9..2034ed6c 100644 --- a/futures/src/runtime.rs +++ b/futures/src/runtime.rs @@ -1,54 +1,10 @@ //! Run commands and keep track of subscriptions. -use crate::BoxFuture; -use crate::{subscription, Executor, Subscription}; +use crate::subscription; +use crate::{BoxFuture, Executor, MaybeSend, Subscription}; use futures::{channel::mpsc, Sink}; use std::marker::PhantomData; -#[cfg(not(target_arch = "wasm32"))] -mod trait_aliases { - use super::*; - - pub trait RuntimeMessage: Send + 'static {} - - impl<T> RuntimeMessage for T where T: Send + 'static {} - - pub trait RuntimeMessageSender<Message: RuntimeMessage>: - Sink<Message, Error = mpsc::SendError> + Unpin + Send + Clone + 'static - { - } - - impl<Message: RuntimeMessage, T> RuntimeMessageSender<Message> for T where - T: Sink<Message, Error = mpsc::SendError> - + Unpin - + Send - + Clone - + 'static - { - } -} - -#[cfg(target_arch = "wasm32")] -mod trait_aliases { - use super::*; - - pub trait RuntimeMessage: 'static {} - - impl<T> RuntimeMessage for T where T: 'static {} - - pub trait RuntimeMessageSender<Message: RuntimeMessage>: - Sink<Message, Error = mpsc::SendError> + Unpin + Clone + 'static - { - } - - impl<Message: RuntimeMessage, T> RuntimeMessageSender<Message> for T where - T: Sink<Message, Error = mpsc::SendError> + Unpin + Clone + 'static - { - } -} - -pub use trait_aliases::{RuntimeMessage, RuntimeMessageSender}; - /// A batteries-included runtime of commands and subscriptions. /// /// If you have an [`Executor`], a [`Runtime`] can be leveraged to run any @@ -67,8 +23,12 @@ where Hasher: std::hash::Hasher + Default, Event: Send + Clone + 'static, Executor: self::Executor, - Sender: RuntimeMessageSender<Message>, - Message: RuntimeMessage, + Sender: Sink<Message, Error = mpsc::SendError> + + Unpin + + MaybeSend + + Clone + + 'static, + Message: MaybeSend + 'static, { /// Creates a new empty [`Runtime`]. /// |