Merge pull request #78 from jbg/master

bound the inner stream on AsyncRead + AsyncWrite rather than Read + Write

Author: ctz

src/stream.rs

@@ -24,39 +24,30 @@ impl<T: fmt::Debug> fmt::Debug for MaybeHttpsStream<T> {
     }
 }
 
-impl<T: Read + Write> Read for MaybeHttpsStream<T> {
+impl<T: AsyncRead + AsyncWrite> Read for MaybeHttpsStream<T> {
     #[inline]
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         match *self {
             MaybeHttpsStream::Http(ref mut s) => s.read(buf),
-            MaybeHttpsStream::Https(ref mut s) => {
-                let (_, cs) = s.get_mut();
-                cs.read(buf)
-            }
+            MaybeHttpsStream::Https(ref mut s) => s.read(buf)
         }
     }
 }
 
-impl<T: Read + Write> Write for MaybeHttpsStream<T> {
+impl<T: AsyncRead + AsyncWrite> Write for MaybeHttpsStream<T> {
     #[inline]
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         match *self {
             MaybeHttpsStream::Http(ref mut s) => s.write(buf),
-            MaybeHttpsStream::Https(ref mut s) => {
-                let (_, cs) = s.get_mut();
-                cs.write(buf)
-            }
+            MaybeHttpsStream::Https(ref mut s) => s.write(buf)
         }
     }
 
     #[inline]
     fn flush(&mut self) -> io::Result<()> {
         match *self {
             MaybeHttpsStream::Http(ref mut s) => s.flush(),
-            MaybeHttpsStream::Https(ref mut s) => {
-                let (_, cs) = s.get_mut();
-                cs.flush()
-            }
+            MaybeHttpsStream::Https(ref mut s) => s.flush()
         }
     }
 }