summaryrefslogtreecommitdiffstats
path: root/futures/src/subscription/tracker.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector0193@gmail.com>2020-03-26 19:33:00 +0100
committerLibravatar GitHub <noreply@github.com>2020-03-26 19:33:00 +0100
commit9ef1801ed647868b624f1e1999141e74a292b980 (patch)
tree7028f6e3c6f28c3d14392e5d1b3bb07586955c28 /futures/src/subscription/tracker.rs
parent643fa18cae19fa1418a23b652b6b4b8bf8ef79fc (diff)
parent338fff35ac821e6b03d68bd94418de500fb50f77 (diff)
downloadiced-9ef1801ed647868b624f1e1999141e74a292b980.tar.gz
iced-9ef1801ed647868b624f1e1999141e74a292b980.tar.bz2
iced-9ef1801ed647868b624f1e1999141e74a292b980.zip
Merge pull request #234 from hecrj/improvement/subscription-send-requirement
Improve compatibility of `iced_futures`
Diffstat (limited to 'futures/src/subscription/tracker.rs')
-rw-r--r--futures/src/subscription/tracker.rs10
1 files changed, 5 insertions, 5 deletions
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<Hasher, Event, Message>,
receiver: Receiver,
- ) -> Vec<BoxFuture<'static, ()>>
+ ) -> Vec<BoxFuture<()>>
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<BoxFuture<()>> = 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));