From 588993ecfa6f91f044950d3103e1353156d081fa Mon Sep 17 00:00:00 2001
From: Stephen Belanger <stephen.belanger@elastic.co>
Date: Sun, 17 Mar 2019 19:55:23 +0100
Subject: [PATCH] Use tokio-codec and tokio-tcp directly

---
 Cargo.toml | 2 ++
 src/lib.rs | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e1d89d8..de90092 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,9 @@ exclude = [
 
 [dependencies]
 tokio-core = "0.1"
+tokio-codec = "0.1"
 tokio-io = "0.1"
+tokio-tcp = "0.1"
 bytes = "0.4"
 futures = "0.1"
 nom = "2.0"
diff --git a/src/lib.rs b/src/lib.rs
index 0e96f52..aca30db 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -29,6 +29,8 @@
 pub extern crate futures;
 pub extern crate tokio_core;
 pub extern crate tokio_io;
+pub extern crate tokio_codec;
+pub extern crate tokio_tcp;
 pub extern crate bytes;
 
 pub extern crate url;
@@ -46,7 +48,7 @@ use futures::{Future, Sink, Stream};
 use bytes::BytesMut;
 
 use tokio_io::{IoFuture, AsyncRead, AsyncWrite};
-use tokio_io::codec::{Framed, Decoder, Encoder};
+use tokio_codec::{Decoder, Encoder};
 
 use url::{Url, ParseError};
 
@@ -55,7 +57,7 @@ use nom::IResult;
 /// Commonly needed reexports from futures and tokio-core.
 pub mod prelude {
     pub use tokio_io::{AsyncRead, AsyncWrite};
-    pub use tokio_core::net::TcpStream;
+    pub use tokio_tcp::TcpStream;
     pub use tokio_core::reactor::Core;
 
     pub use futures::{Future, Sink, Stream, IntoFuture};
@@ -167,7 +169,7 @@ impl HttpRequest {
     where
         T: 'static + AsyncRead + AsyncWrite + Send,
     {
-        let framed = io.framed(HttpCodec::new());
+        let framed = HttpCodec::new().framed(io);
         Box::new(framed
             .send(self)
             .and_then(|framed| framed.into_future().map(|(res, framed)| (res, framed.into_inner())).map_err(|(err, _stream)| err)))