Update futures-minihttp

tests/echo.rs

@@ -3,14 +3,13 @@ extern crate futures;
 extern crate futures_io;
 extern crate futures_mio;
 
-use std::io::{self, Read, Write};
-use std::sync::Arc;
+use std::io::{Read, Write};
+use std::net::TcpStream;
 use std::thread;
 
 use futures::Future;
 use futures::stream::Stream;
-use futures_io::copy;
-use futures_mio::TcpStream;
+use futures_io::{copy, TaskIo};
 
 macro_rules! t {
     ($e:expr) => (match $e {
@@ -30,8 +29,6 @@ fn echo_server() {
 
     let msg = "foo bar baz";
     let t = thread::spawn(move || {
-        use std::net::TcpStream;
-
         let mut s = TcpStream::connect(&addr).unwrap();
 
         for _i in 0..1024 {
@@ -44,10 +41,7 @@ fn echo_server() {
 
     let clients = srv.incoming();
     let client = clients.into_future().map(|e| e.0.unwrap()).map_err(|e| e.0);
-    let halves = client.map(|s| {
-        let s = Arc::new(s.0);
-        (SocketIo(s.clone()), SocketIo(s))
-    });
+    let halves = client.map(|s| TaskIo::new(s.0).split());
     let copied = halves.and_then(|(a, b)| copy(a, b));
 
     let amt = t!(l.run(copied));
@@ -55,21 +49,3 @@ fn echo_server() {
 
     assert_eq!(amt, msg.len() as u64 * 1024);
 }
-
-struct SocketIo(Arc<TcpStream>);
-
-impl Read for SocketIo {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        (&*self.0).read(buf)
-    }
-}
-
-impl Write for SocketIo {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        (&*self.0).write(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        (&*self.0).flush()
-    }
-}

tests/stream-buffered.rs

@@ -3,14 +3,13 @@ extern crate futures_io;
 extern crate futures_mio;
 extern crate env_logger;
 
-use std::sync::Arc;
+use std::io::{Read, Write};
+use std::net::TcpStream;
 use std::thread;
-use std::io::{self, Read, Write};
 
 use futures::Future;
 use futures::stream::Stream;
-use futures_io::copy;
-use futures_mio::TcpStream;
+use futures_io::{copy, TaskIo};
 
 macro_rules! t {
     ($e:expr) => (match $e {
@@ -29,8 +28,6 @@ fn echo_server() {
     let addr = t!(srv.local_addr());
 
     let t = thread::spawn(move || {
-        use std::net::TcpStream;
-
         let mut s1 = t!(TcpStream::connect(&addr));
         let mut s2 = t!(TcpStream::connect(&addr));
 
@@ -45,8 +42,7 @@ fn echo_server() {
     });
 
     let future = srv.incoming()
-                    .map(|s| Arc::new(s.0))
-                    .map(|i| (SocketIo(i.clone()), SocketIo(i)))
+                    .map(|s| TaskIo::new(s.0).split())
                     .map(|(a, b)| copy(a, b).map(|_| ()))
                     .buffered(10)
                     .take(2)
@@ -56,21 +52,3 @@ fn echo_server() {
 
     t.join().unwrap();
 }
-
-struct SocketIo(Arc<TcpStream>);
-
-impl Read for SocketIo {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        (&*self.0).read(buf)
-    }
-}
-
-impl Write for SocketIo {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        (&*self.0).write(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        (&*self.0).flush()
-    }
-}