Merge pull request #406 from eval-exec/exec/drop-async-runtime-features

Drop `async-runtime`,`async-timer` features

Author: driftluo

Makefile

@@ -42,8 +42,6 @@ features-check:
 	$(Change_Work_Path) && cargo build --features parking_lot
 	$(Change_Work_Path) && cargo build --features unstable
 	$(Change_Work_Path) && cargo build --features tokio-runtime,generic-timer,unstable --no-default-features
-	$(Change_Work_Path) && cargo build --features async-runtime,generic-timer,unstable --no-default-features
-	$(Change_Work_Path) && cargo build --features async-runtime,async-timer,unstable --no-default-features
 	# required wasm32-unknown-unknown target
 	$(Change_Work_Path) && cargo build --features wasm-timer,unstable --no-default-features --target=wasm32-unknown-unknown
 	$(Change_Work_Path) && cargo build --features wasm-timer,unstable,secio-async-trait --no-default-features --target=wasm32-unknown-unknown

tentacle/Cargo.toml

@@ -34,8 +34,6 @@ parking_lot = { version = "0.12", optional = true }
 tokio-tungstenite = { version = "0.26", optional = true }
 httparse = { version = "1.9", optional = true }
 futures-timer = { version = "3.0.2", optional = true }
-async-std = { version = "1", features = ["unstable"], optional = true }
-async-io = { version = "1", optional = true }
 
 multiaddr = { path = "../multiaddr", package = "tentacle-multiaddr", version = "0.3.4" }
 molecule = "0.8.0"
@@ -91,8 +89,5 @@ openssl-vendored = ["secio/openssl-vendored"]
 tokio-timer = ["yamux/tokio-timer", "tokio/time", "tokio-runtime"]
 tokio-runtime = ["tokio/io-util", "tokio/net", "tokio/rt-multi-thread"]
 
-async-timer = ["async-runtime"]
-async-runtime = ["async-std", "async-io", "yamux/generic-timer"]
-
 generic-timer = ["futures-timer", "yamux/generic-timer"]
 wasm-timer = ["futures-timer", "yamux/wasm", "futures-timer/wasm-bindgen"]

tentacle/src/lib.rs

@@ -78,9 +78,6 @@
 //! - `tokio-runtime`: Enable by default, use tokio runtime
 //! - `tokio-timer`: Enable by default, use tokio inner timer
 //!
-//! - `async-timer`: use async-io timer
-//! - `async-runtime`: use async-std runtime
-//!
 //! - `generic-timer`: use futures-timer
 //! - `wasm-timer`: only use on Browser WebAssembly platform
 //!

tentacle/src/runtime/async_runtime.rs

@@ -9,8 +9,6 @@
 //! this module contains async timer, compat async read/write between futures and tokio, spawn on any runtime
 //!
 
-#[cfg(all(not(target_family = "wasm"), feature = "async-runtime"))]
-mod async_runtime;
 #[cfg(any(
     feature = "generic-timer",
     all(target_family = "wasm", feature = "wasm-timer")
@@ -21,8 +19,6 @@ mod tokio_runtime;
 #[cfg(target_family = "wasm")]
 mod wasm_runtime;
 
-#[cfg(all(not(target_family = "wasm"), feature = "async-runtime"))]
-pub use async_runtime::*;
 #[cfg(any(
     feature = "generic-timer",
     all(target_family = "wasm", feature = "wasm-timer")

tentacle/src/runtime/mod.rs

@@ -128,18 +128,6 @@ impl Future for DnsResolver {
                 Ok(Err(e)) => Poll::Ready(Err((self.source_address.clone(), e))),
             },
         }
-
-        #[cfg(feature = "async-runtime")]
-        match handle.poll_unpin(cx) {
-            Poll::Pending => {
-                self.join_handle = Some(handle);
-                Poll::Pending
-            }
-            Poll::Ready(res) => match res {
-                Ok(iter) => self.new_addr(iter),
-                Err(e) => Poll::Ready(Err((self.source_address.clone(), e.into()))),
-            },
-        }
     }
 }