summaryrefslogtreecommitdiffstats
path: root/futures
diff options
context:
space:
mode:
Diffstat (limited to 'futures')
-rw-r--r--futures/Cargo.toml4
-rw-r--r--futures/src/executor/tokio.rs3
2 files changed, 4 insertions, 3 deletions
diff --git a/futures/Cargo.toml b/futures/Cargo.toml
index 275d0391..078c96aa 100644
--- a/futures/Cargo.toml
+++ b/futures/Cargo.toml
@@ -20,9 +20,9 @@ log = "0.4"
version = "0.3"
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio]
-version = "0.2"
+version = "0.3"
optional = true
-features = ["rt-core", "rt-threaded", "time", "stream"]
+features = ["rt-multi-thread", "time", "stream"]
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.async-std]
version = "1.0"
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()
}
}