79 files changed, 188 insertions, 377 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 38a26aeb..d6703e16 100644
--- 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
index 1dad7b1d..f9b0d505 100644
--- 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/ci/patch.toml b/ci/patch.toml
index 02290de0..6718f231 100644
--- a/ci/patch.toml
+++ b/ci/patch.toml
@@ -3,7 +3,6 @@
 [patch.crates-io]
 tokio = { path = "tokio" }
 tokio-executor = { path = "tokio-executor" }
-tokio-io = { path = "tokio-io" }
 tokio-macros = { path = "tokio-macros" }
 tokio-sync = { path = "tokio-sync" }
 tokio-tls = { path = "tokio-tls" }
diff --git a/tokio-io/CHANGELOG.md b/tokio-io/CHANGELOG.md
deleted file mode 100644
index 78c6e7a4..00000000
--- a/tokio-io/CHANGELOG.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# 0.2.0-alpha.6 (September 30, 2019)
-
-- Move to `futures-*-preview 0.3.0-alpha.19`
-- Move to `pin-project 0.4`
-
-# 0.2.0-alpha.5 (September 19, 2019)
-
-### Added
-- bring back generic `split` utility (#1521).
-- enable buffering both reads and writes (#1558).
-
-# 0.2.0-alpha.4 (August 29, 2019)
-
-- Track tokio release.
-
-# 0.2.0-alpha.3 (August 28, 2019)
-
-### Added
-- `AsyncReadExt::chain` and `AsyncReadExt::take` (#1484).
-
-# 0.2.0-alpha.2 (August 17, 2019)
-
-### Changed
-- Update `futures` dependency to 0.3.0-alpha.18.
-
-### Added
-- Implement `AsyncWrite` for `Vec<u8>` (#1409).
-- Add `BufReader`, `BufWriter` (#1438).
-
-# 0.2.0-alpha.1 (August 8, 2019)
-
-### Changed
-- Switch to `async`, `await`, and `std::future`.
-
-# 0.1.12 (March 1, 2019)
-
-### Added
-- Add `unsplit` to join previously split `AsyncRead + AsyncWrite` (#807).
-
-# 0.1.11 (January 6, 2019)
-
-* Fix minor error in Decoder::decode API documentation (#797).
-
-# 0.1.10 (October 23, 2018)
-
-* Expose inner codec from `Framed` (#686).
-* Implement AsyncRead::prepare_uninitialized_buffer for Take and Chain (#678).
-
-# 0.1.9 (September 27, 2018)
-
-* Fix bug in `AsyncRead::split()` (#655).
-* Fix non-terminating loop in `length_delimited::FramedWrite` (#576).
-
-# 0.1.8 (August 23, 2018)
-
-* Documentation improvements
-
-# 0.1.7 (June 13, 2018)
-
-* Move `codec::{Encode, Decode, Framed*}` into `tokio-codec` (#353)
-
-# 0.1.6 (March 09, 2018)
-
-* Add native endian builder fn to length_delimited (#144)
-* Add AsyncRead::poll_read, AsyncWrite::poll_write (#170)
-
-# 0.1.5 (February 07, 2018)
-
-* Fix bug in `BytesCodec` and `LinesCodec`.
-* Performance improvement to `split`.
-
-# 0.1.4 (November 10, 2017)
-
-* Use `FrameTooBig` as length delimited error type (#70).
-* Provide `Bytes` and `Lines` codecs (#78).
-* Provide `AllowStdIo` wrapper (#76).
-
-# 0.1.3 (August 14, 2017)
-
-* Fix bug involving zero sized writes in copy helper (#57).
-* Add get / set accessors for length delimited max frame length setting. (#65).
-* Add `Framed::into_parts_and_codec` (#59).
-
-# 0.1.2 (May 23, 2017)
-
-* Add `from_parts` and `into_parts` to the framing combinators.
-* Support passing an initialized buffer to the framing combinators.
-* Add `length_adjustment` support to length delimited encoding (#48).
-
-# 0.1.1 (March 22, 2017)
-
-* Add some omitted `Self: Sized` bounds.
-* Add missing "inner" fns.
-
-# 0.1.0 (March 15, 2017)
-
-* Initial release
diff --git a/tokio-io/Cargo.toml b/tokio-io/Cargo.toml
deleted file mode 100644
index bab90731..00000000
--- a/tokio-io/Cargo.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-[package]
-name = "tokio-io"
-# When releasing to crates.io:
-# - Remove path dependencies
-# - Update html_root_url.
-# - Update doc url
-#   - Cargo.toml
-# - Update CHANGELOG.md.
-# - Create "v0.1.x" git tag.
-version = "0.2.0-alpha.6"
-edition = "2018"
-authors = ["Tokio Contributors <team@tokio.rs>"]
-license = "MIT"
-repository = "https://github.com/tokio-rs/tokio"
-homepage = "https://tokio.rs"
-documentation = "https://docs.rs/tokio-io/0.2.0-alpha.6/tokio_io"
-description = """
-Core I/O primitives for asynchronous I/O in Rust.
-"""
-categories = ["asynchronous"]
-
-[features]
-util = ["memchr", "pin-project"]
-
-[dependencies]
-bytes = "0.4.7"
-log = "0.4"
-futures-core-preview = "=0.3.0-alpha.19"
-memchr = { version = "2.2", optional = true }
-pin-project = { version = "0.4", optional = true }
-
-[dev-dependencies]
-tokio = { version = "=0.2.0-alpha.6", path = "../tokio" }
-tokio-test = { version = "=0.2.0-alpha.6", path = "../tokio-test" }
-
-futures-util-preview = "=0.3.0-alpha.19"
-
-[package.metadata.docs.rs]
-all-features = true
diff --git a/tokio-io/LICENSE b/tokio-io/LICENSE
deleted file mode 100644
index cdb28b4b..00000000
--- a/tokio-io/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2019 Tokio Contributors
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/tokio-io/README.md b/tokio-io/README.md
deleted file mode 100644
index 9aad7a32..00000000
--- a/tokio-io/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# tokio-io
-
-Core I/O abstractions for the Tokio stack.
-
-## License
-
-This project is licensed under the [MIT license](LICENSE).
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in Tokio by you, shall be licensed as MIT, without any additional
-terms or conditions.
diff --git a/tokio-io/src/lib.rs b/tokio-io/src/lib.rs
deleted file mode 100644
index 19c0338e..00000000
--- a/tokio-io/src/lib.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-#![doc(html_root_url = "https://docs.rs/tokio-io/0.2.0-alpha.6")]
-#![warn(
-    missing_debug_implementations,
-    missing_docs,
-    rust_2018_idioms,
-    unreachable_pub
-)]
-#![deny(intra_doc_link_resolution_failure)]
-#![doc(test(
-    no_crate_inject,
-    attr(deny(warnings, rust_2018_idioms), allow(dead_code, unused_variables))
-))]
-
-//! Core I/O traits and combinators when working with Tokio.
-//!
-//! A description of the high-level I/O combinators can be [found online] in
-//! addition to a description of the [low level details].
-//!
-//! [found online]: https://tokio.rs/docs/
-//! [low level details]: https://tokio.rs/docs/going-deeper-tokio/core-low-level/
-
-mod async_buf_read;
-mod async_read;
-mod async_write;
-
-#[cfg(feature = "util")]
-mod io;
-
-#[cfg(feature = "util")]
-pub mod split;
-
-pub use self::async_buf_read::AsyncBufRead;
-pub use self::async_read::AsyncRead;
-pub use self::async_write::AsyncWrite;
-
-#[cfg(feature = "util")]
-pub use self::io::{
-    copy, empty, repeat, sink, AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufReader, BufStream,
-    BufWriter, Copy, Empty, Repeat, Sink, Take,
-};
-
-// Re-export `Buf` and `BufMut` since they are part of the API
-pub use bytes::{Buf, BufMut};
-
-#[cfg(feature = "util")]
-#[cfg(test)]
-fn is_unpin<T: Unpin>() {}
diff --git a/tokio-test/Cargo.toml b/tokio-test/Cargo.toml
index ce9ece11..b53f9f0b 100644
--- 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
index 6610c1db..afd1c423 100644
--- 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
index 611a2bba..2168aa8b 100644
--- 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
index f1d763d7..de29b244 100644
--- 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
index 1ac3a1c8..1d1c566a 100644
--- 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
index 720e0b6e..dfe5f8ee 100644
--- 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
index e2eb82cb..8f2317f0 100644
--- 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
index 71f22150..6f79cb9a 100644
--- 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
index fa8aba17..3a95612c 100644
--- 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};
diff --git a/tokio-util/src/codec/length_delimited.rs b/tokio-util/src/codec/length_delimited.rs
index 579417a2..df07466e 100644
--- a/tokio-util/src/codec/length_delimited.rs
+++ b/tokio-util/src/codec/length_delimited.rs
@@ -15,7 +15,7 @@
 //! byte stream into a stream of frames.
 //!
 //! ```
-//! use tokio_io::{AsyncRead, AsyncWrite};
+//! use tokio::io::{AsyncRead, AsyncWrite};
 //! use tokio_util::codec::{Framed, LengthDelimitedCodec};
 //!
 //! fn bind_transport<T: AsyncRead + AsyncWrite>(io: T)
@@ -78,7 +78,7 @@
 //! frame head in the yielded `BytesMut`.
 //!
 //! ```
-//! # use tokio_io::AsyncRead;
+//! # use tokio::io::AsyncRead;
 //! # use tokio_util::codec::LengthDelimitedCodec;
 //! # fn bind_read<T: AsyncRead>(io: T) {
 //! LengthDelimitedCodec::builder()
@@ -112,7 +112,7 @@
 //! frame head in the yielded `BytesMut`.
 //!
 //! ```
-//! # use tokio_io::AsyncRead;
+//! # use tokio::io::AsyncRead;
 //! # use tokio_util::codec::LengthDelimitedCodec;
 //! # fn bind_read<T: AsyncRead>(io: T) {
 //! LengthDelimitedCodec::builder()
@@ -144,7 +144,7 @@
 //! **includes** the frame head length.
 //!
 //! ```
-//! # use tokio_io::AsyncRead;
+//! # use tokio::io::AsyncRead;
 //! # use tokio_util::codec::LengthDelimitedCodec;
 //! # fn bind_read<T: AsyncRead>(io: T) {
 //! LengthDelimitedCodec::builder()
@@ -178,7 +178,7 @@
 //! frame head, including the frame head in the yielded `BytesMut`.
 //!
 //! ```
-//! # use tokio_io::AsyncRead;
+//! # use tokio::io::AsyncRead;
 //! # use tokio_util::codec::LengthDelimitedCodec;
 //! # fn bind_read<T: AsyncRead>(io: T) {
 //! LengthDelimitedCodec::builder()
@@ -222,7 +222,7 @@
 //! included.
 //!
 //! ```
-//! # use tokio_io::AsyncRead;
+//! # use tokio::io::AsyncRead;
 //! # use tokio_util::codec::LengthDelimitedCodec;
 //! # fn bind_read<T: AsyncRead>(io: T) {
 //! LengthDelimitedCodec::builder()
@@ -268,7 +268,7 @@
 //! length.
 //!
 //! ```
-//! # use tokio_io::AsyncRead;
+