diff options
| author | Carl Lerche <me@carllerche.com> | 2019-08-15 20:37:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-15 20:37:25 -0700 |
| commit | 4788d3a9e3dd037424442c98e9f26b93a33a2077 (patch) | |
| tree | 5324a25c3578964a2aa38c4cd6a1ed324078cdd6 /tokio | |
| parent | f1f61a3b15d17767b12bfd8c0c5712db1b089b0b (diff) | |
tcp: move tokio-tcp into tokio-net (#1456)
Diffstat (limited to 'tokio')
| -rw-r--r-- | tokio/Cargo.toml | 5 | ||||
| -rw-r--r-- | tokio/src/net.rs | 2 | ||||
| -rw-r--r-- | tokio/tests/reactor.rs | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index 815346b6..2b37a32c 100644 --- a/tokio/Cargo.toml +++ b/tokio/Cargo.toml @@ -49,7 +49,7 @@ rt-full = [ "tracing-core", ] sync = ["tokio-sync"] -tcp = ["io", "tokio-net", "tokio-tcp"] +tcp = ["io", "tokio-net/tcp"] timer = ["tokio-timer"] udp = ["io", "tokio-net", "tokio-udp"] uds = ["io", "tokio-net", "tokio-uds"] @@ -67,9 +67,8 @@ tokio-fs = { version = "=0.2.0-alpha.1", optional = true, path = "../tokio-fs" } tokio-io = { version = "=0.2.0-alpha.1", optional = true, features = ["util"], path = "../tokio-io" } tokio-executor = { version = "=0.2.0-alpha.1", optional = true, path = "../tokio-executor" } tokio-macros = { version = "=0.2.0-alpha.1", optional = true, path = "../tokio-macros" } -tokio-net = { version = "=0.2.0-alpha.1", optional = true, path = "../tokio-net" } +tokio-net = { version = "=0.2.0-alpha.1", optional = true, features = ["async-traits"], path = "../tokio-net" } tokio-sync = { version = "=0.2.0-alpha.1", optional = true, path = "../tokio-sync", features = ["async-traits"] } -tokio-tcp = { version = "=0.2.0-alpha.1", optional = true, path = "../tokio-tcp", features = ["async-traits"] } tokio-udp = { version = "=0.2.0-alpha.1", optional = true, path = "../tokio-udp" } tokio-timer = { version = "=0.3.0-alpha.1", optional = true, path = "../tokio-timer", features = ["async-traits"] } tracing-core = { version = "0.1", optional = true } diff --git a/tokio/src/net.rs b/tokio/src/net.rs index 84675fdf..6163d880 100644 --- a/tokio/src/net.rs +++ b/tokio/src/net.rs @@ -40,7 +40,7 @@ pub mod tcp { //! [`TcpListener`]: struct.TcpListener.html //! [incoming_method]: struct.TcpListener.html#method.incoming //! [`Incoming`]: struct.Incoming.html - pub use tokio_tcp::{split, TcpListener, TcpStream}; + pub use tokio_net::tcp::{split, TcpListener, TcpStream}; } #[cfg(feature = "tcp")] pub use self::tcp::{TcpListener, TcpStream}; diff --git a/tokio/tests/reactor.rs b/tokio/tests/reactor.rs index 8e93bd48..d39a5a3d 100644 --- a/tokio/tests/reactor.rs +++ b/tokio/tests/reactor.rs @@ -3,7 +3,7 @@ #![cfg(feature = "default")] use tokio_net::driver::Reactor; -use tokio_tcp::TcpListener; +use tokio_net::tcp::TcpListener; use tokio_test::{assert_ok, assert_pending}; use futures_util::task::{waker_ref, ArcWake}; |