From 338fff35ac821e6b03d68bd94418de500fb50f77 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 26 Mar 2020 14:55:02 +0100 Subject: Make `subscription::Recipe` cross-platform By removing the `Send` requirement when targetting Wasm --- futures/src/subscription/tracker.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'futures/src/subscription/tracker.rs') diff --git a/futures/src/subscription/tracker.rs b/futures/src/subscription/tracker.rs index cfa36170..efb464b5 100644 --- a/futures/src/subscription/tracker.rs +++ b/futures/src/subscription/tracker.rs @@ -1,6 +1,6 @@ -use crate::Subscription; +use crate::{BoxFuture, Subscription}; -use futures::{channel::mpsc, future::BoxFuture, sink::Sink}; +use futures::{channel::mpsc, sink::Sink}; use std::{collections::HashMap, marker::PhantomData}; /// A registry of subscription streams. @@ -59,7 +59,7 @@ where &mut self, subscription: Subscription, receiver: Receiver, - ) -> Vec> + ) -> Vec> where Message: 'static + Send, Receiver: 'static @@ -70,7 +70,7 @@ where { use futures::{future::FutureExt, stream::StreamExt}; - let mut futures = Vec::new(); + let mut futures: Vec> = Vec::new(); let recipes = subscription.recipes(); let mut alive = std::collections::HashSet::new(); @@ -115,7 +115,7 @@ where }, ); - futures.push(future.boxed()); + futures.push(Box::pin(future)); } self.subscriptions.retain(|id, _| alive.contains(&id)); -- cgit