From 4920f5e264c57f87dc8b91e7ed9a575359cc093c Mon Sep 17 00:00:00 2001 From: Douman Date: Sun, 18 Aug 2019 14:16:25 +0200 Subject: [PATCH] chore(dependencies): Upgrade tokio --- Cargo.toml | 22 +++++++++------------- src/client/connect/dns.rs | 11 +++++------ src/client/connect/http.rs | 6 +++--- src/server/conn.rs | 2 +- src/server/mod.rs | 3 +-- src/server/tcp.rs | 6 +++--- tests/client.rs | 8 ++++---- tests_disabled/server.rs | 4 ++-- 8 files changed, 28 insertions(+), 34 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 44e02082..7f0a6e31 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,15 +36,13 @@ log = "0.4" net2 = { version = "0.2.32", optional = true } pin-utils = "0.1.0-alpha.4" time = "0.1" -tokio = { version = "0.2.0-alpha.1", optional = true, default-features = false, features = ["rt-full"] } +tokio = { version = "0.2.0-alpha.2", optional = true, default-features = false, features = ["rt-full"] } tokio-buf = "0.2.0-alpha.1" -tokio-executor = "0.2.0-alpha.1" -tokio-io = "0.2.0-alpha.1" -tokio-reactor = { version = "0.2.0-alpha.1", optional = true } -tokio-sync = "0.2.0-alpha.1" -tokio-tcp = { version = "0.2.0-alpha.1", optional = true, features = ["async-traits"] } -tokio-threadpool = { version = "0.2.0-alpha.1", optional = true } -tokio-timer = { version = "0.3.0-alpha.1", optional = true } +tokio-executor = "0.2.0-alpha.2" +tokio-io = "0.2.0-alpha.2" +tokio-sync = "0.2.0-alpha.2" +tokio-net = { version = "0.2.0-alpha.2", optional = true, features = ["tcp"] } +tokio-timer = { version = "0.3.0-alpha.2", optional = true } want = { git = "https://github.com/seanmonstar/want", branch = "std-future" } [dev-dependencies] @@ -55,8 +53,8 @@ spmc = "0.3" serde = "1.0" serde_derive = "1.0" serde_json = "1.0" -tokio-fs = "0.2.0-alpha.1" -tokio-test = "0.2.0-alpha.1" +tokio-fs = "0.2.0-alpha.2" +tokio-test = "0.2.0-alpha.2" url = "1.0" @@ -68,9 +66,7 @@ default = [ runtime = [ "net2", "tokio", - "tokio-reactor", - "tokio-tcp", - "tokio-threadpool", + "tokio-net", "tokio-timer", ] nightly = [] diff --git a/src/client/connect/dns.rs b/src/client/connect/dns.rs index cdc08358..d31756ee 100644 --- a/src/client/connect/dns.rs +++ b/src/client/connect/dns.rs @@ -19,7 +19,6 @@ use std::sync::Arc; use futures_util::{FutureExt, StreamExt}; use tokio_executor::TypedExecutor; use tokio_sync::{mpsc, oneshot}; -use tokio_threadpool; use crate::common::{Future, Never, Pin, Poll, Unpin, task}; @@ -42,7 +41,7 @@ pub struct Name { /// A resolver using blocking `getaddrinfo` calls in a threadpool. #[derive(Clone)] pub struct GaiResolver { - tx: tokio_threadpool::Sender, + tx: tokio_executor::threadpool::Sender, /// A handle to keep the threadpool alive until all `GaiResolver` clones /// have been dropped. _threadpool_keep_alive: ThreadPoolKeepAlive, @@ -114,7 +113,7 @@ impl GaiResolver { /// /// Takes number of DNS worker threads. pub fn new(threads: usize) -> Self { - let pool = tokio_threadpool::Builder::new() + let pool = tokio_executor::threadpool::Builder::new() .name_prefix("hyper-dns-gai-resolver") // not for CPU tasks, so only spawn workers // in blocking mode @@ -296,7 +295,7 @@ impl Iterator for IpAddrs { } } -/// A resolver using `getaddrinfo` calls via the `tokio_threadpool::blocking` API. +/// A resolver using `getaddrinfo` calls via the `tokio_executor::threadpool::blocking` API. /// /// Unlike the `GaiResolver` this will not spawn dedicated threads, but only works when running on the /// multi-threaded Tokio runtime. @@ -332,10 +331,10 @@ impl Future for TokioThreadpoolGaiFuture { type Output = Result; fn poll(mut self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll { - match ready!(tokio_threadpool::blocking(|| (self.name.as_str(), 0).to_socket_addrs())) { + match ready!(tokio_executor::threadpool::blocking(|| (self.name.as_str(), 0).to_socket_addrs())) { Ok(Ok(iter)) => Poll::Ready(Ok(GaiAddrs { inner: IpAddrs { iter } })), Ok(Err(e)) => Poll::Ready(Err(e)), - // a BlockingError, meaning not on a tokio_threadpool :( + // a BlockingError, meaning not on a tokio_executor::threadpool :( Err(e) => Poll::Ready(Err(io::Error::new(io::ErrorKind::Other, e))), } } diff --git a/src/client/connect/http.rs b/src/client/connect/http.rs index a0b830c6..16e57cca 100644 --- a/src/client/connect/http.rs +++ b/src/client/connect/http.rs @@ -8,8 +8,8 @@ use std::time::{Duration, Instant}; use http::uri::Scheme; use net2::TcpBuilder; -use tokio_reactor::Handle; -use tokio_tcp::{TcpStream/*, ConnectFuture*/}; +use tokio_net::driver::Handle; +use tokio_net::tcp::{TcpStream/*, ConnectFuture*/}; use tokio_timer::Delay; use crate::common::{Future, Pin, Poll, task}; @@ -623,7 +623,7 @@ mod tests { use futures::{Async, Poll}; use tokio::runtime::current_thread::Runtime; - use tokio_reactor::Handle; + use tokio_net::driver::Handle; use super::dns; use super::ConnectingTcp; diff --git a/src/server/conn.rs b/src/server/conn.rs index fa6090ae..95759be3 100644 --- a/src/server/conn.rs +++ b/src/server/conn.rs @@ -20,7 +20,7 @@ use futures_core::Stream; use h2; use pin_utils::{unsafe_pinned, unsafe_unpinned}; use tokio_io::{AsyncRead, AsyncWrite}; -#[cfg(feature = "runtime")] use tokio_reactor::Handle; +#[cfg(feature = "runtime")] use tokio_net::driver::Handle; use crate::body::{Body, Payload}; use crate::common::exec::{Exec, H2Exec, NewSvcExec}; diff --git a/src/server/mod.rs b/src/server/mod.rs index 449b48d5..42b1e3ed 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -62,7 +62,6 @@ use std::fmt; use futures_core::Stream; use pin_utils::unsafe_pinned; use tokio_io::{AsyncRead, AsyncWrite}; -#[cfg(feature = "runtime")] use tokio_reactor; use crate::body::{Body, Payload}; use crate::common::exec::{Exec, H2Exec, NewSvcExec}; @@ -132,7 +131,7 @@ impl Server { /// Create a new instance from a `std::net::TcpListener` instance. pub fn from_tcp(listener: StdTcpListener) -> Result, crate::Error> { - let handle = tokio_reactor::Handle::default(); + let handle = tokio_net::driver::Handle::default(); AddrIncoming::from_std(listener, &handle) .map(Server::builder) } diff --git a/src/server/tcp.rs b/src/server/tcp.rs index ef64726b..75d7d476 100644 --- a/src/server/tcp.rs +++ b/src/server/tcp.rs @@ -5,8 +5,8 @@ use std::time::{Duration, Instant}; use futures_core::Stream; use futures_util::FutureExt as _; -use tokio_reactor::Handle; -use tokio_tcp::TcpListener; +use tokio_net::driver::Handle; +use tokio_net::tcp::TcpListener; use tokio_timer::Delay; use crate::common::{Future, Pin, Poll, task}; @@ -196,7 +196,7 @@ mod addr_stream { use std::io; use std::net::SocketAddr; use bytes::{Buf, BufMut}; - use tokio_tcp::TcpStream; + use tokio_net::tcp::TcpStream; use tokio_io::{AsyncRead, AsyncWrite}; use crate::common::{Pin, Poll, task}; diff --git a/tests/client.rs b/tests/client.rs index e924ef70..22192eae 100644 --- a/tests/client.rs +++ b/tests/client.rs @@ -7,7 +7,7 @@ extern crate net2; extern crate pretty_env_logger; extern crate tokio; extern crate tokio_io; -extern crate tokio_tcp; +extern crate tokio_net; extern crate tokio_timer; use std::io::{Read, Write}; @@ -25,7 +25,7 @@ use futures_util::future::{self, FutureExt}; use futures_util::try_future::{self, TryFutureExt}; use futures_util::try_stream::TryStreamExt; use tokio::runtime::current_thread::Runtime; -use tokio_tcp::TcpStream; +use tokio_net::tcp::TcpStream; fn s(buf: &[u8]) -> &str { ::std::str::from_utf8(buf).expect("from_utf8") @@ -773,7 +773,7 @@ mod dispatch_impl { use futures_util::try_stream::TryStreamExt; use tokio::runtime::current_thread::Runtime; use tokio_io::{AsyncRead, AsyncWrite}; - use tokio_tcp::TcpStream; + use tokio_net::tcp::TcpStream; use tokio_timer::Delay; use hyper::client::connect::{Connect, Connected, Destination, HttpConnector}; @@ -1635,7 +1635,7 @@ mod conn { use futures_util::try_stream::TryStreamExt; use tokio::runtime::current_thread::Runtime; use tokio_io::{AsyncRead, AsyncWrite}; - use tokio_tcp::TcpStream; + use tokio_net::tcp::TcpStream; use tokio_timer::Delay; use hyper::{self, Request, Body, Method}; diff --git a/tests_disabled/server.rs b/tests_disabled/server.rs index b695c41b..f2a4f06c 100644 --- a/tests_disabled/server.rs +++ b/tests_disabled/server.rs @@ -10,7 +10,7 @@ extern crate spmc; extern crate pretty_env_logger; extern crate tokio; extern crate tokio_io; -extern crate tokio_tcp; +extern crate tokio_net; use std::net::{TcpStream, Shutdown, SocketAddr}; use std::io::{self, Read, Write}; @@ -26,7 +26,7 @@ use futures::future::{self, FutureResult, Either}; use futures::sync::oneshot; use futures_timer::Delay; use http::header::{HeaderName, HeaderValue}; -use tokio_tcp::{TcpListener, TcpStream as TkTcpStream}; +use tokio_net::tcp::{TcpListener, TcpStream as TkTcpStream}; use tokio::runtime::current_thread::Runtime; use tokio::reactor::Handle; use tokio_io::{AsyncRead, AsyncWrite};