Merge pull request #595 from valbendan/master

upgrade tokio to latest version(v0.3)

12 files changed, 72 insertions, 13 deletions

diff --git a/Cargo.toml b/Cargo.toml
index b829c702..a0433732 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,6 +37,8 @@ glow_default_system_font = ["iced_glow/default_system_font"]
 debug = ["iced_winit/debug"]
 # Enables `tokio` as the `executor::Default` on native platforms
 tokio = ["iced_futures/tokio"]
+# Enables old `tokio` (0.2) as the `executor::Default` on native platforms
+tokio_old = ["iced_futures/tokio_old"]
 # Enables `async-std` as the `executor::Default` on native platforms
 async-std = ["iced_futures/async-std"]
 # Enables advanced color conversion via `palette`
diff --git a/examples/download_progress/Cargo.toml b/examples/download_progress/Cargo.toml
index 34e6a132..4b05e7dc 100644
--- a/examples/download_progress/Cargo.toml
+++ b/examples/download_progress/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 publish = false
 
 [dependencies]
-iced = { path = "../..", features = ["tokio"] }
+iced = { path = "../..", features = ["tokio_old"] }
 iced_native = { path = "../../native" }
 iced_futures = { path = "../../futures" }
 reqwest = "0.10"
diff --git a/examples/game_of_life/Cargo.toml b/examples/game_of_life/Cargo.toml
index b9bb7f2a..9c4172c4 100644
--- a/examples/game_of_life/Cargo.toml
+++ b/examples/game_of_life/Cargo.toml
@@ -7,6 +7,6 @@ publish = false
 
 [dependencies]
 iced = { path = "../..", features = ["canvas", "tokio", "debug"] }
-tokio = { version = "0.2", features = ["blocking"] }
+tokio = { version = "0.3", features = ["sync"] }
 itertools = "0.9"
 rustc-hash = "1.1"
diff --git a/examples/pokedex/Cargo.toml b/examples/pokedex/Cargo.toml
index 94320086..05e73992 100644
--- a/examples/pokedex/Cargo.toml
+++ b/examples/pokedex/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 publish = false
 
 [dependencies]
-iced = { path = "../..", features = ["image", "debug", "tokio"] }
+iced = { path = "../..", features = ["image", "debug", "tokio_old"] }
 serde_json = "1.0"
 
 [dependencies.serde]
diff --git a/futures/Cargo.toml b/futures/Cargo.toml
index 275d0391..7854dbb0 100644
--- a/futures/Cargo.toml
+++ b/futures/Cargo.toml
@@ -19,11 +19,17 @@ log = "0.4"
 [dependencies.futures]
 version = "0.3"
 
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio]
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio_old]
+package = "tokio"
 version = "0.2"
 optional = true
 features = ["rt-core", "rt-threaded", "time", "stream"]
 
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio]
+version = "0.3"
+optional = true
+features = ["rt-multi-thread", "time", "stream"]
+
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.async-std]
 version = "1.0"
 optional = true
diff --git a/futures/src/executor.rs b/futures/src/executor.rs
index cbd34ee8..13abe430 100644
--- a/futures/src/executor.rs
+++ b/futures/src/executor.rs
@@ -7,6 +7,9 @@ mod thread_pool;
 #[cfg(all(not(target_arch = "wasm32"), feature = "tokio"))]
 mod tokio;
 
+#[cfg(all(not(target_arch = "wasm32"), feature = "tokio_old"))]
+mod tokio_old;
+
 #[cfg(all(not(target_arch = "wasm32"), feature = "async-std"))]
 mod async_std;
 
@@ -21,6 +24,9 @@ pub use thread_pool::ThreadPool;
 #[cfg(all(not(target_arch = "wasm32"), feature = "tokio"))]
 pub use self::tokio::Tokio;
 
+#[cfg(all(not(target_arch = "wasm32"), feature = "tokio_old"))]
+pub use self::tokio_old::TokioOld;
+
 #[cfg(all(not(target_arch = "wasm32"), feature = "async-std"))]
 pub use self::async_std::AsyncStd;
 
diff --git a/futures/src/executor/tokio.rs b/futures/src/executor/tokio.rs
index a730bce8..c6a21cec 100644
--- a/futures/src/executor/tokio.rs
+++ b/futures/src/executor/tokio.rs
@@ -16,6 +16,7 @@ impl Executor for Tokio {
     }
 
     fn enter<R>(&self, f: impl FnOnce() -> R) -> R {
-        tokio::runtime::Runtime::enter(self, f)
+        let _guard = tokio::runtime::Runtime::enter(self);
+        f()
     }
 }
diff --git a/futures/src/executor/tokio_old.rs b/futures/src/executor/tokio_old.rs
new file mode 100644
index 00000000..d64729fa
--- /dev/null
+++ b/futures/src/executor/tokio_old.rs
@@ -0,0 +1,21 @@
+use crate::Executor;
+
+use futures::Future;
+
+/// An old `tokio` runtime.
+#[cfg_attr(docsrs, doc(cfg(feature = "tokio_old")))]
+pub type TokioOld = tokio_old::runtime::Runtime;
+
+impl Executor for TokioOld {
+    fn new() -> Result<Self, futures::io::Error> {
+        tokio_old::runtime::Runtime::new()
+    }
+
+    fn spawn(&self, future: impl Future<Output = ()> + Send + 'static) {
+        let _ = tokio_old::runtime::Runtime::spawn(self, future);
+    }
+
+    fn enter<R>(&self, f: impl FnOnce() -> R) -> R {
+        tokio_old::runtime::Runtime::enter(self, f)
+    }
+}
diff --git a/futures/src/lib.rs b/futures/src/lib.rs
index 46fc59fc..f46db449 100644
--- a/futures/src/lib.rs
+++ b/futures/src/lib.rs
@@ -15,7 +15,7 @@ pub mod executor;
 pub mod subscription;
 
 #[cfg(all(
-    any(feature = "tokio", feature = "async-std"),
+    any(feature = "tokio", feature = "tokio_old", feature = "async-std"),
     not(target_arch = "wasm32")
 ))]
 #[cfg_attr(docsrs, doc(cfg(any(feature = "tokio", feature = "async-std"))))]
diff --git a/futures/src/time.rs b/futures/src/time.rs
index e87b4a83..ec007d88 100644
--- a/futures/src/time.rs
+++ b/futures/src/time.rs
@@ -41,7 +41,10 @@ where
     }
 }
 
-#[cfg(all(feature = "tokio", not(feature = "async-std")))]
+#[cfg(all(
+    any(feature = "tokio", feature = "tokio_old"),
+    not(feature = "async-std")
+))]
 impl<H, E> subscription::Recipe<H, E> for Every
 where
     H: std::hash::Hasher,
@@ -61,6 +64,9 @@ where
     ) -> futures::stream::BoxStream<'static, Self::Output> {
         use futures::stream::StreamExt;
 
+        #[cfg(feature = "tokio_old")]
+        use tokio_old as tokio;
+
         let start = tokio::time::Instant::now() + self.0;
 
         tokio::time::interval_at(start, self.0)
diff --git a/src/executor.rs b/src/executor.rs
index ea6ab14a..0333bc1d 100644
--- a/src/executor.rs
+++ b/src/executor.rs
@@ -7,13 +7,23 @@ pub use platform::Default;
 mod platform {
     use iced_futures::{executor, futures};
 
-    #[cfg(feature = "tokio")]
+    #[cfg(feature = "tokio_old")]
+    type Executor = executor::TokioOld;
+
+    #[cfg(all(not(feature = "tokio_old"), feature = "tokio"))]
     type Executor = executor::Tokio;
 
-    #[cfg(all(not(feature = "tokio"), feature = "async-std"))]
+    #[cfg(all(
+        not(any(feature = "tokio_old", feature = "tokio")),
+        feature = "async-std"
+    ))]
     type Executor = executor::AsyncStd;
 
-    #[cfg(not(any(feature = "tokio", feature = "async-std")))]
+    #[cfg(not(any(
+        feature = "tokio_old",
+        feature = "tokio",
+        feature = "async-std"
+    )))]
     type Executor = executor::ThreadPool;
 
     /// A default cross-platform executor.
@@ -40,7 +50,7 @@ mod platform {
         }
 
         fn enter<R>(&self, f: impl FnOnce() -> R) -> R {
-            self.0.enter(f)
+            super::Executor::enter(&self.0, f)
         }
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index 610683b3..6b61d297 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -193,10 +193,17 @@ pub mod widget;
 pub mod window;
 
 #[cfg(all(
-    any(feature = "tokio", feature = "async-std"),
+    any(feature = "tokio", feature = "tokio_old", feature = "async-std"),
     not(target_arch = "wasm32")
 ))]
-#[cfg_attr(docsrs, doc(cfg(any(feature = "tokio", feature = "async-std"))))]
+#[cfg_attr(
+    docsrs,
+    doc(cfg(any(
+        feature = "tokio",
+        feature = "tokio_old",
+        feature = "async-std"
+    )))
+)]
 pub mod time;
 
 #[cfg(all(