berkus
/
actix-net
mirror of https://github.com/fafhrd91/actix-net
1
0
Fork 0
Code Issues Releases Wiki Activity

remove tokio compat layer

This commit is contained in:
fakeshadow 2020-11-30 00:47:14 +08:00
parent a94270a683
commit 582660910b
5 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actix-connect/Cargo.toml
View File

@ -41,11 +41,10 @@ either = "1.5.3"
futures-util = { version = "0.3.4", default-features = false } futures-util = { version = "0.3.4", default-features = false }
# FIXME: Use release version # FIXME: Use release version
http = { git = "https://github.com/paolobarbolini/http.git", branch = "bytes06", optional = true } http = { git = "https://github.com/paolobarbolini/http.git", branch = "bytes06", optional = true }
#http = { version = "0.2.0", optional = true }
log = "0.4" log = "0.4"
tokio-compat-02 = "0.1.2" # FIXME: Use release version
trust-dns-proto = { version = "0.19", default-features = false, features = ["tokio-runtime"] } trust-dns-proto = { git = "https://github.com/bluejekyll/trust-dns", branch = "main", default-features = false, features = ["tokio-runtime"] }
trust-dns-resolver = { version = "0.19", default-features = false, features = ["tokio-runtime", "system-config"] } trust-dns-resolver = { git = "https://github.com/bluejekyll/trust-dns", branch = "main", default-features = false, features = ["tokio-runtime", "system-config"] }
# openssl # openssl
open-ssl = { package = "openssl", version = "0.10", optional = true } open-ssl = { package = "openssl", version = "0.10", optional = true }
@ -59,3 +58,4 @@ webpki = { version = "0.21", optional = true }
[dev-dependencies] [dev-dependencies]
bytes = "0.6" bytes = "0.6"
actix-testing = "1.0.0" actix-testing = "1.0.0"
futures-util = { version = "0.3.4", default-features = false, features = ["sink"] }

8
actix-connect/src/lib.rs
View File

@ -43,9 +43,7 @@ pub async fn start_resolver(
cfg: ResolverConfig, cfg: ResolverConfig,
opts: ResolverOpts, opts: ResolverOpts,
) -> Result<AsyncResolver, ConnectError> { ) -> Result<AsyncResolver, ConnectError> {
// FIXME: remove compat layer Ok(AsyncResolver::tokio(cfg, opts)?)
use tokio_compat_02::FutureExt;
Ok(AsyncResolver::tokio(cfg, opts).compat().await?)
} }
struct DefaultResolver(AsyncResolver); struct DefaultResolver(AsyncResolver);
@ -62,9 +60,7 @@ pub(crate) async fn get_default_resolver() -> Result<AsyncResolver, ConnectError
} }
}; };
// FIXME: remove compat layer let resolver = AsyncResolver::tokio(cfg, opts)?;
use tokio_compat_02::FutureExt;
let resolver = AsyncResolver::tokio(cfg, opts).compat().await?;
Arbiter::set_item(DefaultResolver(resolver.clone())); Arbiter::set_item(DefaultResolver(resolver.clone()));
Ok(resolver) Ok(resolver)

4
actix-connect/src/resolve.rs
View File

@ -163,9 +163,7 @@ impl<T: Address> ResolverFuture<T> {
ResolverFuture { ResolverFuture {
lookup: Box::pin(async move { lookup: Box::pin(async move {
let resolver = resolver_clone; let resolver = resolver_clone;
// FIXME: Remove compat layer resolver.lookup_ip(host_clone).await
use tokio_compat_02::FutureExt;
resolver.lookup_ip(host_clone).compat().await
}), }),
req: Some(req), req: Some(req),
} }

2
actix-server/src/builder.rs
View File

@ -286,7 +286,7 @@ impl ServerBuilder {
// handle signals // handle signals
if !self.no_signals { if !self.no_signals {
Signals::start(self.server.clone()).unwrap(); Signals::start(self.server.clone());
} }
// start http server actor // start http server actor

7
actix-server/src/signals.rs
View File

@ -1,5 +1,4 @@
use std::future::Future; use std::future::Future;
use std::io;
use std::pin::Pin; use std::pin::Pin;
use std::task::{Context, Poll}; use std::task::{Context, Poll};
@ -28,7 +27,7 @@ pub(crate) struct Signals {
} }
impl Signals { impl Signals {
pub(crate) fn start(srv: Server) -> io::Result<()> { pub(crate) fn start(srv: Server) {
#[cfg(not(unix))] #[cfg(not(unix))]
{ {
actix_rt::spawn(Signals { actix_rt::spawn(Signals {
@ -60,10 +59,8 @@ impl Signals {
} }
} }
actix_rt::spawn(Signals { srv, streams }) actix_rt::spawn(Signals { srv, streams });
} }
Ok(())
} }
} }