forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(dependencies): disable unneeded optional tokio features

Browse Source 
Closes #1739
This commit is contained in:
Sean McArthur
2019-01-07 14:50:18 -08:00
parent cf034e99fa
commit e5135dd6f6
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -29,7 +29,7 @@ itoa = "0.4.1"
log = "0.4" log = "0.4"
net2 = { version = "0.2.32", optional = true } net2 = { version = "0.2.32", optional = true }
time = "0.1" time = "0.1"
tokio = { version = "0.1.7", optional = true } tokio = { version = "0.1.14", optional = true, default-features = false, features = ["rt-full"] }
tokio-executor = { version = "0.1.0", optional = true } tokio-executor = { version = "0.1.0", optional = true }
tokio-io = "0.1" tokio-io = "0.1"
tokio-reactor = { version = "0.1", optional = true } tokio-reactor = { version = "0.1", optional = true }

7
tests/client.rs
View File

@@ -6,6 +6,7 @@ extern crate futures_timer;
extern crate net2; extern crate net2;
extern crate tokio; extern crate tokio;
extern crate tokio_io; extern crate tokio_io;
extern crate tokio_tcp;
extern crate pretty_env_logger; extern crate pretty_env_logger;
use std::io::{Read, Write}; use std::io::{Read, Write};
@@ -18,7 +19,7 @@ use hyper::{Body, Client, Method, Request, StatusCode};
use futures::{Future, Stream}; use futures::{Future, Stream};
use futures::sync::oneshot; use futures::sync::oneshot;
use tokio::runtime::current_thread::Runtime; use tokio::runtime::current_thread::Runtime;
use tokio::net::tcp::{ConnectFuture, TcpListener as TkTcpListener, TcpStream}; use tokio_tcp::{ConnectFuture, TcpListener as TkTcpListener, TcpStream};
fn s(buf: &[u8]) -> &str { fn s(buf: &[u8]) -> &str {
::std::str::from_utf8(buf).expect("from_utf8") ::std::str::from_utf8(buf).expect("from_utf8")
@@ -713,7 +714,7 @@ mod dispatch_impl {
use futures::{self, Future}; use futures::{self, Future};
use futures::sync::{mpsc, oneshot}; use futures::sync::{mpsc, oneshot};
use futures_timer::Delay; use futures_timer::Delay;
use tokio::net::TcpStream; use tokio_tcp::TcpStream;
use tokio::runtime::current_thread::Runtime; use tokio::runtime::current_thread::Runtime;
use tokio_io::{AsyncRead, AsyncWrite}; use tokio_io::{AsyncRead, AsyncWrite};
@@ -1578,7 +1579,7 @@ mod conn {
use futures::sync::oneshot; use futures::sync::oneshot;
use futures_timer::Delay; use futures_timer::Delay;
use tokio::runtime::current_thread::Runtime; use tokio::runtime::current_thread::Runtime;
use tokio::net::TcpStream; use tokio_tcp::TcpStream;
use tokio_io::{AsyncRead, AsyncWrite}; use tokio_io::{AsyncRead, AsyncWrite};
use hyper::{self, Request, Body, Method}; use hyper::{self, Request, Body, Method};

3
tests/server.rs
View File

@@ -9,6 +9,7 @@ extern crate spmc;
extern crate pretty_env_logger; extern crate pretty_env_logger;
extern crate tokio; extern crate tokio;
extern crate tokio_io; extern crate tokio_io;
extern crate tokio_tcp;
use std::net::{TcpStream, Shutdown, SocketAddr}; use std::net::{TcpStream, Shutdown, SocketAddr};
use std::io::{self, Read, Write}; use std::io::{self, Read, Write};
@@ -24,7 +25,7 @@ use futures::future::{self, FutureResult, Either};
use futures::sync::oneshot; use futures::sync::oneshot;
use futures_timer::Delay; use futures_timer::Delay;
use http::header::{HeaderName, HeaderValue}; use http::header::{HeaderName, HeaderValue};
use tokio::net::{TcpListener, TcpStream as TkTcpStream}; use tokio_tcp::{TcpListener, TcpStream as TkTcpStream};
use tokio::runtime::current_thread::Runtime; use tokio::runtime::current_thread::Runtime;
use tokio::reactor::Handle; use tokio::reactor::Handle;
use tokio_io::{AsyncRead, AsyncWrite}; use tokio_io::{AsyncRead, AsyncWrite};