reivilibre
/
iced-mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upgrade tokio to latest version(v0.3)

This commit is contained in:
valbendan 2020-11-05 11:36:23 +08:00
parent e6131783e9
commit eacb2e913f
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/game_of_life/Cargo.toml
View File

@ -7,6 +7,6 @@ publish = false
[dependencies] [dependencies]
iced = { path = "../..", features = ["canvas", "tokio", "debug"] } iced = { path = "../..", features = ["canvas", "tokio", "debug"] }
tokio = { version = "0.2", features = ["blocking"] } tokio = { version = "0.3", features = ["sync"] }
itertools = "0.9" itertools = "0.9"
rustc-hash = "1.1" rustc-hash = "1.1"

4
futures/Cargo.toml
View File

@ -20,9 +20,9 @@ log = "0.4"
version = "0.3" version = "0.3"
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio] [target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio]
version = "0.2" version = "0.3"
optional = true optional = true
features = ["rt-core", "rt-threaded", "time", "stream"] features = ["rt-multi-thread", "time", "stream"]
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.async-std] [target.'cfg(not(target_arch = "wasm32"))'.dependencies.async-std]
version = "1.0" version = "1.0"

3
futures/src/executor/tokio.rs
View File

@ -16,6 +16,7 @@ impl Executor for Tokio {
} }
fn enter<R>(&self, f: impl FnOnce() -> R) -> R { fn enter<R>(&self, f: impl FnOnce() -> R) -> R {
tokio::runtime::Runtime::enter(self, f) let _guard = tokio::runtime::Runtime::enter(self);
f()
} }
} }

3
src/executor.rs
View File

@ -40,7 +40,8 @@ mod platform {
} }
fn enter<R>(&self, f: impl FnOnce() -> R) -> R { fn enter<R>(&self, f: impl FnOnce() -> R) -> R {
self.0.enter(f) let _guard = self.0.enter();
f()
} }
} }
} }