Update to hyper 1.0

Fixes hjr3#24.

This commit wraps up the hyper 1.0 update.

Specific to this commit:
- `test_read_timeout` error matching is rewritten to add the
  `hyper_util::client::legacy::Error` outermost level of abstraction
- README is updated
- passes all tests, clippy

Bigger picture:
- now uses hyper IO traits
- no longer depends on tokio-io-timeout

Author: allan2

README.md

@@ -19,16 +19,17 @@ There is a `TimeoutConnector` that implements the `hyper::Connect` trait. This c
 Hyper version compatibility:
 
 * The `master` branch will track on going development for hyper.
+* The `0.5` release supports hyper 1.0.
 * The `0.4` release supports hyper 0.14.
 * The `0.3` release supports hyper 0.13.
 * The `0.2` release supports hyper 0.12.
 * The `0.1` release supports hyper 0.11.
 
-Assuming you are using hyper 0.14, add this to your `Cargo.toml`:
+Assuming you are using hyper 1.0, add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-hyper-timeout = "0.4"
+hyper-timeout = "0.5"
 ```
 
 See the [client example](./examples/client.rs) for a working example.

examples/client.rs

@@ -46,5 +46,3 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     Ok(())
 }
-
-

src/lib.rs

@@ -183,15 +183,13 @@ mod tests {
 
         let res = client.get(url).await;
 
-        match res {
-            Ok(_) => panic!("Expected a timeout"),
-            Err(e) => {
-                if let Some(io_e) = e.source().unwrap().downcast_ref::<io::Error>() {
-                    assert_eq!(io_e.kind(), io::ErrorKind::TimedOut);
-                } else {
-                    panic!("Expected timeout error");
+        if let Err(client_e) = res {
+            if let Some(hyper_e) = client_e.source() {
+                if let Some(io_e) = hyper_e.source().unwrap().downcast_ref::<io::Error>() {
+                    return assert_eq!(io_e.kind(), io::ErrorKind::TimedOut);
                 }
             }
         }
+        panic!("Expected timeout error");
     }
 }

src/stream.rs

@@ -12,7 +12,6 @@ use hyper_util::client::legacy::connect::{Connected, Connection};
 use pin_project_lite::pin_project;
 use std::future::Future;
 use std::io;
-use std::marker::PhantomPinned;
 use std::pin::Pin;
 use std::task::{ready, Context, Poll};
 use std::time::Duration;
@@ -500,8 +499,6 @@ pin_project! {
     struct ReadFut<'a, R: ?Sized> {
         reader: &'a mut R,
         buf: &'a mut [u8],
-        #[pin]
-        _pin: PhantomPinned,
     }
 }
 
@@ -514,11 +511,7 @@ fn read<'a, R>(reader: &'a mut R, buf: &'a mut [u8]) -> ReadFut<'a, R>
 where
     R: Read + Unpin + ?Sized,
 {
-    ReadFut {
-        reader,
-        buf,
-        _pin: PhantomPinned,
-    }
+    ReadFut { reader, buf }
 }
 
 impl<R> Future for ReadFut<'_, R>
@@ -551,8 +544,6 @@ pin_project! {
     struct WriteFut<'a, W: ?Sized> {
         writer: &'a mut W,
         buf: &'a [u8],
-        #[pin]
-        _pin: PhantomPinned,
     }
 }
 
@@ -562,11 +553,7 @@ fn write<'a, W>(writer: &'a mut W, buf: &'a [u8]) -> WriteFut<'a, W>
 where
     W: Write + Unpin + ?Sized,
 {
-    WriteFut {
-        writer,
-        buf,
-        _pin: PhantomPinned,
-    }
+    WriteFut { writer, buf }
 }
 
 impl<W> Future for WriteFut<'_, W>
@@ -694,7 +681,7 @@ mod test {
         reader.set_timeout(Some(Duration::from_millis(100)));
         pin!(reader);
 
-        let r = reader.read(&mut [0]).await;
+        let r = reader.read(&mut [0, 1, 2]).await;
         assert_eq!(r.err().unwrap().kind(), io::ErrorKind::TimedOut);
     }
 
@@ -757,3 +744,4 @@ mod test {
         }
     }
 }
+