Skip to content

Commit e5135dd

Browse files
committed
fix(dependencies): disable unneeded optional tokio features
Closes #1739
1 parent cf034e9 commit e5135dd

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ itoa = "0.4.1"
2929
log = "0.4"
3030
net2 = { version = "0.2.32", optional = true }
3131
time = "0.1"
32-
tokio = { version = "0.1.7", optional = true }
32+
tokio = { version = "0.1.14", optional = true, default-features = false, features = ["rt-full"] }
3333
tokio-executor = { version = "0.1.0", optional = true }
3434
tokio-io = "0.1"
3535
tokio-reactor = { version = "0.1", optional = true }

tests/client.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ extern crate futures_timer;
66
extern crate net2;
77
extern crate tokio;
88
extern crate tokio_io;
9+
extern crate tokio_tcp;
910
extern crate pretty_env_logger;
1011

1112
use std::io::{Read, Write};
@@ -18,7 +19,7 @@ use hyper::{Body, Client, Method, Request, StatusCode};
1819
use futures::{Future, Stream};
1920
use futures::sync::oneshot;
2021
use tokio::runtime::current_thread::Runtime;
21-
use tokio::net::tcp::{ConnectFuture, TcpListener as TkTcpListener, TcpStream};
22+
use tokio_tcp::{ConnectFuture, TcpListener as TkTcpListener, TcpStream};
2223

2324
fn s(buf: &[u8]) -> &str {
2425
::std::str::from_utf8(buf).expect("from_utf8")
@@ -713,7 +714,7 @@ mod dispatch_impl {
713714
use futures::{self, Future};
714715
use futures::sync::{mpsc, oneshot};
715716
use futures_timer::Delay;
716-
use tokio::net::TcpStream;
717+
use tokio_tcp::TcpStream;
717718
use tokio::runtime::current_thread::Runtime;
718719
use tokio_io::{AsyncRead, AsyncWrite};
719720

@@ -1578,7 +1579,7 @@ mod conn {
15781579
use futures::sync::oneshot;
15791580
use futures_timer::Delay;
15801581
use tokio::runtime::current_thread::Runtime;
1581-
use tokio::net::TcpStream;
1582+
use tokio_tcp::TcpStream;
15821583
use tokio_io::{AsyncRead, AsyncWrite};
15831584

15841585
use hyper::{self, Request, Body, Method};

tests/server.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ extern crate spmc;
99
extern crate pretty_env_logger;
1010
extern crate tokio;
1111
extern crate tokio_io;
12+
extern crate tokio_tcp;
1213

1314
use std::net::{TcpStream, Shutdown, SocketAddr};
1415
use std::io::{self, Read, Write};
@@ -24,7 +25,7 @@ use futures::future::{self, FutureResult, Either};
2425
use futures::sync::oneshot;
2526
use futures_timer::Delay;
2627
use http::header::{HeaderName, HeaderValue};
27-
use tokio::net::{TcpListener, TcpStream as TkTcpStream};
28+
use tokio_tcp::{TcpListener, TcpStream as TkTcpStream};
2829
use tokio::runtime::current_thread::Runtime;
2930
use tokio::reactor::Handle;
3031
use tokio_io::{AsyncRead, AsyncWrite};

0 commit comments

Comments
 (0)