io: move into tokio crate

A step towards collapsing Tokio sub crates into a single `tokio` crate (#1318). The `io` implementation is now provided by the main `tokio` crate. Functionality can be opted out of by using the various net related feature flags.
tokio-rs · Oct 25, 2019 · ef38170 · ef38170
1 parent 227533d
commit ef38170
Show file tree

Hide file tree

Showing 78 changed files with 183 additions and 372 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,6 @@
 members = [
   "tokio",
   "tokio-executor",
-  "tokio-io",
   "tokio-macros",
   "tokio-sync",
   "tokio-test",

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -28,6 +28,7 @@ jobs:
       tokio:
         - fs
         - io
+        - io-util
         - net-driver
         - process
         - rt-full
@@ -49,8 +50,6 @@ jobs:
       tokio-executor:
         - current-thread
         - thread-pool
-      tokio-io:
-        - util
       tokio-sync:
         - async-traits
       tokio-macros: []

diff --git a/tokio-io/CHANGELOG.md b/tokio-io/CHANGELOG.md
diff --git a/tokio-io/Cargo.toml b/tokio-io/Cargo.toml
diff --git a/tokio-io/LICENSE b/tokio-io/LICENSE
diff --git a/tokio-io/README.md b/tokio-io/README.md
diff --git a/tokio-io/src/lib.rs b/tokio-io/src/lib.rs
diff --git a/tokio-test/Cargo.toml b/tokio-test/Cargo.toml
@@ -22,9 +22,9 @@ categories = ["asynchronous", "testing"]
 [dependencies]
 tokio = { version = "=0.2.0-alpha.6", path = "../tokio" }
 tokio-executor = { version = "=0.2.0-alpha.6", path = "../tokio-executor" }
-tokio-io = { version = "=0.2.0-alpha.6", path = "../tokio-io" }
 tokio-sync = { version = "=0.2.0-alpha.6", path = "../tokio-sync" }
 
+bytes = "0.4"
 futures-core-preview = "=0.3.0-alpha.19"
 pin-convert = "0.1.0"
 

diff --git a/tokio-test/src/io.rs b/tokio-test/src/io.rs
@@ -16,10 +16,11 @@
 //! [`AsyncRead`]: tokio_io::AsyncRead
 //! [`AsyncWrite`]: tokio_io::AsyncWrite
 
+use tokio::io::{AsyncRead, AsyncWrite};
+use tokio::sync::mpsc;
 use tokio::timer::{clock, timer, Delay};
-use tokio_io::{AsyncRead, AsyncWrite, Buf};
-use tokio_sync::mpsc;
 
+use bytes::Buf;
 use futures_core::ready;
 use std::collections::VecDeque;
 use std::future::Future;

diff --git a/tokio-tls/Cargo.toml b/tokio-tls/Cargo.toml
@@ -26,7 +26,7 @@ travis-ci = { repository = "tokio-rs/tokio-tls" }
 
 [dependencies]
 native-tls = "0.2"
-tokio-io = { version = "=0.2.0-alpha.6", path = "../tokio-io" }
+tokio = { version = "=0.2.0-alpha.6", path = "../tokio", features = ["io-traits"] }
 
 [dev-dependencies]
 tokio = { version = "=0.2.0-alpha.6", path = "../tokio" }

diff --git a/tokio-tls/src/lib.rs b/tokio-tls/src/lib.rs
@@ -28,6 +28,8 @@
 //! built. Configuration of TLS parameters is still primarily done through the
 //! `native-tls` crate.
 
+use tokio::io::{AsyncRead, AsyncWrite};
+
 use native_tls::{Error, HandshakeError, MidHandshakeTlsStream};
 use std::fmt;
 use std::future::Future;
@@ -36,7 +38,6 @@ use std::marker::Unpin;
 use std::pin::Pin;
 use std::ptr::null_mut;
 use std::task::{Context, Poll};
-use tokio_io::{AsyncRead, AsyncWrite};
 
 #[derive(Debug)]
 struct AllowStd<S> {

diff --git a/tokio-util/Cargo.toml b/tokio-util/Cargo.toml
@@ -20,7 +20,6 @@ Additional utilities for working with Tokio.
 categories = ["asynchronous"]
 
 [dependencies]
-tokio-io = { version = "=0.2.0-alpha.6", path = "../tokio-io" }
 tokio = { version = "=0.2.0-alpha.6", path = "../tokio" }
 
 bytes = "0.4.7"

diff --git a/tokio-util/src/codec/decoder.rs b/tokio-util/src/codec/decoder.rs
@@ -1,7 +1,7 @@
 use crate::codec::encoder::Encoder;
 use crate::codec::Framed;
 
-use tokio_io::{AsyncRead, AsyncWrite};
+use tokio::io::{AsyncRead, AsyncWrite};
 
 use bytes::BytesMut;
 use std::io;

diff --git a/tokio-util/src/codec/framed.rs b/tokio-util/src/codec/framed.rs
@@ -3,7 +3,7 @@ use crate::codec::encoder::Encoder;
 use crate::codec::framed_read::{framed_read2, framed_read2_with_buffer, FramedRead2};
 use crate::codec::framed_write::{framed_write2, framed_write2_with_buffer, FramedWrite2};
 
-use tokio_io::{AsyncBufRead, AsyncRead, AsyncWrite};
+use tokio::io::{AsyncBufRead, AsyncRead, AsyncWrite};
 
 use bytes::BytesMut;
 use futures_core::Stream;

diff --git a/tokio-util/src/codec/framed_read.rs b/tokio-util/src/codec/framed_read.rs
@@ -1,7 +1,7 @@
 use crate::codec::framed::Fuse;
 use crate::codec::Decoder;
 
-use tokio_io::AsyncRead;
+use tokio::io::AsyncRead;
 
 use bytes::BytesMut;
 use futures_core::Stream;

diff --git a/tokio-util/src/codec/framed_write.rs b/tokio-util/src/codec/framed_write.rs
@@ -2,7 +2,7 @@ use crate::codec::decoder::Decoder;
 use crate::codec::encoder::Encoder;
 use crate::codec::framed::Fuse;
 
-use tokio_io::{AsyncBufRead, AsyncRead, AsyncWrite};
+use tokio::io::{AsyncBufRead, AsyncRead, AsyncWrite};
 
 use bytes::BytesMut;
 use futures_core::{ready, Stream};