Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix tokio compatibility #882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2020
Merged

fix tokio compatibility #882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ alloc = [
"futures-core/alloc",
"pin-project-lite",
]
tokio02 = ["tokio"]
tokio02 = ["async-global-executor/tokio02"]

[dependencies]
async-attributes = { version = "1.1.1", optional = true }
Expand All @@ -78,7 +78,7 @@ slab = { version = "0.4.2", optional = true }
surf = { version = "1.0.3", optional = true }

[target.'cfg(not(target_os = "unknown"))'.dependencies]
async-global-executor = { version = "1.0.2", optional = true, features = ["async-io"] }
async-global-executor = { version = "1.2.1", optional = true, features = ["async-io"] }
async-io = { version = "1.0.1", optional = true }
blocking = { version = "1.0.0", optional = true }
futures-lite = { version = "1.0.0", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion src/task/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ impl Builder {
TaskLocalsWrapper::set_current(&wrapped.tag, || {
let res = if should_run {
// The first call should run the executor
crate::task::executor::run(wrapped)
async_global_executor::block_on(wrapped)
} else {
futures_lite::future::block_on(wrapped)
};
Expand Down
41 changes: 0 additions & 41 deletions src/task/executor.rs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/task/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,6 @@ cfg_default! {
mod block_on;
mod builder;
mod current;
#[cfg(not(target_os = "unknown"))]
pub(crate) mod executor;
mod join_handle;
mod sleep;
#[cfg(not(target_os = "unknown"))]
Expand Down