Merge pull request #882 from Keruspe/tokio-fix

fix tokio compatibility

Author: yoshuawuyts

Cargo.toml

@@ -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 }
@@ -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 }

src/task/builder.rs

@@ -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)
                     };

src/task/executor.rs

@@ -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"))]