Reexport Encoder, Decoder, Framed* from tokio::codec (#499)

Cargo.toml

@@ -42,6 +42,7 @@ travis-ci = { repository = "tokio-rs/tokio" }
 appveyor = { repository = "carllerche/tokio", id = "s83yxhy9qeb58va7" }
 
 [dependencies]
+tokio-codec = { version = "0.1.0", path = "tokio-codec" }
 tokio-current-thread = { version = "0.1.0", path = "tokio-current-thread" }
 tokio-io = { version = "0.1.6", path = "tokio-io" }
 tokio-executor = { version = "0.1.2", path = "tokio-executor" }
@@ -58,8 +59,6 @@ futures = "0.1.20"
 mio = "0.6.14"
 
 [dev-dependencies]
-tokio-codec = { version = "0.1.0", path = "tokio-codec" }
-
 bytes = "0.4"
 env_logger = { version = "0.5", default-features = false }
 flate2 = { version = "1", features = ["tokio"] }

examples/connect.rs

@@ -17,7 +17,6 @@
 #![deny(warnings)]
 
 extern crate tokio;
-extern crate tokio_codec;
 extern crate tokio_io;
 extern crate futures;
 extern crate bytes;
@@ -83,7 +82,7 @@ fn main() {
 mod codec {
     use std::io;
     use bytes::{BufMut, BytesMut};
-    use tokio_codec::{Encoder, Decoder};
+    use tokio::codec::{Encoder, Decoder};
 
     /// A simple `Codec` implementation that just ships bytes around.
     ///
@@ -121,9 +120,9 @@ mod codec {
 
 mod tcp {
     use tokio;
-    use tokio_codec::Decoder;
     use tokio::net::TcpStream;
     use tokio::prelude::*;
+    use tokio::codec::Decoder;
 
     use bytes::BytesMut;
     use codec::Bytes;

examples/print_each_packet.rs

@@ -56,11 +56,11 @@
 
 extern crate tokio;
 extern crate tokio_codec;
-extern crate tokio_io;
 
-use tokio_codec::{Decoder, BytesCodec};
+use tokio_codec::BytesCodec;
 use tokio::net::TcpListener;
 use tokio::prelude::*;
+use tokio::codec::Decoder;
 
 use std::env;
 use std::net::SocketAddr;

examples/tinyhttp.rs

@@ -21,7 +21,6 @@ extern crate serde_derive;
 extern crate serde_json;
 extern crate time;
 extern crate tokio;
-extern crate tokio_codec;
 extern crate tokio_io;
 
 use std::{env, fmt, io};
@@ -29,8 +28,7 @@ use std::net::SocketAddr;
 
 use tokio::net::{TcpStream, TcpListener};
 use tokio::prelude::*;
-
-use tokio_codec::{Encoder, Decoder};
+use tokio::codec::{Encoder, Decoder};
 
 use bytes::BytesMut;
 use http::header::HeaderValue;

src/lib.rs

@@ -73,6 +73,7 @@ extern crate mio;
 extern crate tokio_current_thread;
 extern crate tokio_io;
 extern crate tokio_executor;
+extern crate tokio_codec;
 extern crate tokio_fs;
 extern crate tokio_reactor;
 extern crate tokio_threadpool;
@@ -92,6 +93,29 @@ pub mod util;
 pub use executor::spawn;
 pub use runtime::run;
 
+pub mod codec {
+    //! Utilities for encoding and decoding frames.
+    //!
+    //! Contains adapters to go from streams of bytes, [`AsyncRead`] and
+    //! [`AsyncWrite`], to framed streams implementing [`Sink`] and [`Stream`].
+    //! Framed streams are also known as [transports].
+    //!
+    //! [`AsyncRead`]: #
+    //! [`AsyncWrite`]: #
+    //! [`Sink`]: #
+    //! [`Stream`]: #
+    //! [transports]: #
+
+    pub use tokio_codec::{
+        Decoder,
+        Encoder,
+        Framed,
+        FramedParts,
+        FramedRead,
+        FramedWrite,
+    };
+}
+
 pub mod io {
     //! Asynchronous I/O.
     //!