From 90690702e1e4abab804ec91e8ff4183824bec436 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 20 Jan 2020 04:47:36 +0100
Subject: Add `Application::Executor` associated type

---
 native/src/lib.rs                 | 7 +++++--
 native/src/runtime.rs             | 2 --
 native/src/subscription.rs        | 2 +-
 native/src/subscription/events.rs | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'native/src')

diff --git a/native/src/lib.rs b/native/src/lib.rs
index 7730c6a3..b5856c00 100644
--- a/native/src/lib.rs
+++ b/native/src/lib.rs
@@ -42,7 +42,6 @@
 pub mod input;
 pub mod layout;
 pub mod renderer;
-pub mod runtime;
 pub mod subscription;
 pub mod widget;
 pub mod window;
@@ -52,6 +51,7 @@ mod element;
 mod event;
 mod hasher;
 mod mouse_cursor;
+mod runtime;
 mod size;
 mod user_interface;
 
@@ -59,7 +59,10 @@ pub use iced_core::{
     Align, Background, Color, Font, HorizontalAlignment, Length, Point,
     Rectangle, Vector, VerticalAlignment,
 };
-pub use iced_futures::Command;
+pub use iced_futures::{executor, futures, Command};
+
+#[doc(no_inline)]
+pub use executor::Executor;
 
 pub use clipboard::Clipboard;
 pub use element::Element;
diff --git a/native/src/runtime.rs b/native/src/runtime.rs
index 2b3abbf1..9fa031f4 100644
--- a/native/src/runtime.rs
+++ b/native/src/runtime.rs
@@ -10,5 +10,3 @@ use crate::{Event, Hasher};
 /// [`Subscription`]: ../struct.Subscription.html
 pub type Runtime<Executor, Receiver, Message> =
     iced_futures::Runtime<Hasher, Event, Executor, Receiver, Message>;
-
-pub use iced_futures::runtime::Executor;
diff --git a/native/src/subscription.rs b/native/src/subscription.rs
index 43f1758a..0d002c6c 100644
--- a/native/src/subscription.rs
+++ b/native/src/subscription.rs
@@ -1,6 +1,6 @@
 //! Listen to external events in your application.
 use crate::{Event, Hasher};
-use futures::stream::BoxStream;
+use iced_futures::futures::stream::BoxStream;
 
 /// A request to listen to external events.
 ///
diff --git a/native/src/subscription/events.rs b/native/src/subscription/events.rs
index 6ff2c0fb..7d33166e 100644
--- a/native/src/subscription/events.rs
+++ b/native/src/subscription/events.rs
@@ -2,6 +2,7 @@ use crate::{
     subscription::{EventStream, Recipe},
     Event, Hasher,
 };
+use iced_futures::futures::stream::BoxStream;
 
 pub struct Events;
 
@@ -17,7 +18,7 @@ impl Recipe<Hasher, Event> for Events {
     fn stream(
         self: Box<Self>,
         event_stream: EventStream,
-    ) -> futures::stream::BoxStream<'static, Self::Output> {
+    ) -> BoxStream<'static, Self::Output> {
         event_stream
     }
 }
-- 
cgit