Skip to content

Use tokio-codec and tokio-tcp directly #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Qard wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use tokio-codec and tokio-tcp directly #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 5 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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};

Expand All @@ -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};
Expand Down Expand Up @@ -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)))
Expand Down