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

---
 futures/src/executor/tokio.rs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 futures/src/executor/tokio.rs

(limited to 'futures/src/executor/tokio.rs')

diff --git a/futures/src/executor/tokio.rs b/futures/src/executor/tokio.rs
new file mode 100644
index 00000000..aafa7e7b
--- /dev/null
+++ b/futures/src/executor/tokio.rs
@@ -0,0 +1,19 @@
+use crate::Executor;
+
+use futures::Future;
+
+pub type Tokio = tokio::runtime::Runtime;
+
+impl Executor for Tokio {
+    fn new() -> Result<Self, futures::io::Error> {
+        tokio::runtime::Runtime::new()
+    }
+
+    fn spawn(&self, future: impl Future<Output = ()> + Send + 'static) {
+        let _ = tokio::runtime::Runtime::spawn(self, future);
+    }
+
+    fn enter<R>(&self, f: impl FnOnce() -> R) -> R {
+        tokio::runtime::Runtime::enter(self, f)
+    }
+}
-- 
cgit 


From f14009601e270e43bdf29b8f4842cf136fbbd8b9 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 20 Jan 2020 09:49:17 +0100
Subject: Write documentation for `iced_futures`

---
 futures/src/executor/tokio.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'futures/src/executor/tokio.rs')

diff --git a/futures/src/executor/tokio.rs b/futures/src/executor/tokio.rs
index aafa7e7b..4c609686 100644
--- a/futures/src/executor/tokio.rs
+++ b/futures/src/executor/tokio.rs
@@ -2,6 +2,7 @@ use crate::Executor;
 
 use futures::Future;
 
+/// The `tokio` runtime.
 pub type Tokio = tokio::runtime::Runtime;
 
 impl Executor for Tokio {
-- 
cgit 


From 91d9d65a03ce9b211e4043726e7424949d314325 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 20 Jan 2020 10:49:25 +0100
Subject: Improve consistency in executor documentation

---
 futures/src/executor/tokio.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'futures/src/executor/tokio.rs')

diff --git a/futures/src/executor/tokio.rs b/futures/src/executor/tokio.rs
index 4c609686..20802ceb 100644
--- a/futures/src/executor/tokio.rs
+++ b/futures/src/executor/tokio.rs
@@ -2,7 +2,7 @@ use crate::Executor;
 
 use futures::Future;
 
-/// The `tokio` runtime.
+/// A `tokio` runtime.
 pub type Tokio = tokio::runtime::Runtime;
 
 impl Executor for Tokio {
-- 
cgit