tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-09-06 00:00:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update TcpStream::connect_stream() to return TcpStreamNew

Browse Source
This commit is contained in:
Alexander Reece
2016-12-20 20:41:13 -05:00
parent 000e9b5ab9
commit 3dd4178bb5
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/tcp.rs
+6 -5
View File
@@ -227,7 +227,7 @@ pub struct TcpStreamNew {
inner: TcpStreamNewFuture, inner: TcpStreamNewFuture,
} }
pub type TcpStreamNewConnected = ::futures::AndThen< type TcpStreamNewConnected = ::futures::AndThen<
::futures::future::FutureResult< ::futures::future::FutureResult<
::reactor::PollEvented<::mio::tcp::TcpStream>, ::reactor::PollEvented<::mio::tcp::TcpStream>,
::std::io::Error, ::std::io::Error,
@@ -236,7 +236,7 @@ pub type TcpStreamNewConnected = ::futures::AndThen<
fn (::reactor::PollEvented<::mio::tcp::TcpStream>) -> ::net::tcp::TcpStreamConnect fn (::reactor::PollEvented<::mio::tcp::TcpStream>) -> ::net::tcp::TcpStreamConnect
>; >;
pub enum TcpStreamNewFuture { enum TcpStreamNewFuture {
Connected(TcpStreamNewConnected), Connected(TcpStreamNewConnected),
Error(::futures::future::Err<TcpStream, ::std::io::Error>), Error(::futures::future::Err<TcpStream, ::std::io::Error>),
} }
@@ -308,11 +308,12 @@ impl TcpStream {
/// (perhaps to `INADDR_ANY`) before this method is called. /// (perhaps to `INADDR_ANY`) before this method is called.
pub fn connect_stream(stream: net::TcpStream, pub fn connect_stream(stream: net::TcpStream,
addr: &SocketAddr, addr: &SocketAddr,
handle: &Handle) -> TcpStreamNewFuture { handle: &Handle) -> TcpStreamNew {
match mio::tcp::TcpStream::connect_stream(stream, addr) { let future = match mio::tcp::TcpStream::connect_stream(stream, addr) {
Ok(tcp) => TcpStream::new(tcp, handle), Ok(tcp) => TcpStream::new(tcp, handle),
Err(e) => TcpStreamNewFuture::Error(failed(e)), Err(e) => TcpStreamNewFuture::Error(failed(e)),
} };
TcpStreamNew { inner: future }
} }
/// Test whether this socket is ready to be read or not. /// Test whether this socket is ready to be read or not.