me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make subscription::Recipe cross-platform

Browse source 
By removing the `Send` requirement when targetting Wasm
This commit is contained in:
Héctor Ramón Jiménez 2020-03-26 14:55:02 +01:00
parent 138110f596
commit 338fff35ac
3 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

34
futures/src/subscription.rs
View file

@ -3,7 +3,7 @@ mod tracker;
pub use tracker::Tracker;
use futures::stream::BoxStream;
use crate::BoxStream;
/// A request to listen to external events.
///
@ -168,8 +168,8 @@ pub trait Recipe<Hasher: std::hash::Hasher, Event> {
/// [`Recipe`]: trait.Recipe.html
fn stream(
self: Box<Self>,
input: BoxStream<'static, Event>,
) -> BoxStream<'static, Self::Output>;
input: BoxStream<Event>,
) -> BoxStream<Self::Output>;
}
struct Map<Hasher, Event, A, B> {
@ -201,18 +201,16 @@ where
self.recipe.hash(state);
}
fn stream(
self: Box<Self>,
input: BoxStream<'static, E>,
) -> futures::stream::BoxStream<'static, Self::Output> {
fn stream(self: Box<Self>, input: BoxStream<E>) -> BoxStream<Self::Output> {
use futures::StreamExt;
let mapper = self.mapper;
self.recipe
.stream(input)
.map(move |element| mapper(element))
.boxed()
Box::pin(
self.recipe
.stream(input)
.map(move |element| mapper(element)),
)
}
}
@ -243,17 +241,15 @@ where
self.recipe.hash(state);
}
fn stream(
self: Box<Self>,
input: BoxStream<'static, E>,
) -> futures::stream::BoxStream<'static, Self::Output> {
fn stream(self: Box<Self>, input: BoxStream<E>) -> BoxStream<Self::Output> {
use futures::StreamExt;
let value = self.value;
self.recipe
.stream(input)
.map(move |element| (value.clone(), element))
.boxed()
Box::pin(
self.recipe
.stream(input)
.map(move |element| (value.clone(), element)),
)
}
}