Migrate to new error types

work in progress

Author: yoshuawuyts

src/client.rs

@@ -8,14 +8,14 @@ use http_types::{
     headers::{HeaderName, HeaderValue, CONTENT_LENGTH, DATE, TRANSFER_ENCODING},
     Body, Request, Response, StatusCode,
 };
+use http_types::{Error, ErrorKind};
 
 use std::pin::Pin;
 use std::str::FromStr;
 
 use crate::chunked::ChunkedDecoder;
 use crate::date::fmt_http_date;
-use crate::error::HttpError;
-use crate::{Exception, MAX_HEADERS};
+use crate::{MAX_HEADERS};
 
 /// An HTTP encoder.
 #[derive(Debug)]
@@ -98,7 +98,7 @@ pub async fn encode(req: Request) -> Result<Encoder, std::io::Error> {
 }
 
 /// Decode an HTTP response on the client.
-pub async fn decode<R>(reader: R) -> Result<Response, Exception>
+pub async fn decode<R>(reader: R) -> Result<Response, Error>
 where
     R: Read + Unpin + Send + Sync + 'static,
 {
@@ -125,15 +125,14 @@ where
     // Convert our header buf into an httparse instance, and validate.
     let status = httparse_res.parse(&buf)?;
     if status.is_partial() {
-        dbg!(String::from_utf8(buf).unwrap());
-        return Err("Malformed HTTP head".into());
+        return Err(Error::new(ErrorKind::InvalidData, "Malformed HTTP head", StatusCode::BadRequest));
     }
-    let code = httparse_res.code.ok_or_else(|| "No status code found")?;
+    let code = httparse_res.code.ok_or_else(|| Err(Error::new(ErrorKind::InvalidData, "No status code found", StatusCode::BadRequest)))?;
 
     // Convert httparse headers + body into a `http::Response` type.
-    let version = httparse_res.version.ok_or_else(|| "No version found")?;
+    let version = httparse_res.version.ok_or_else(|| Err(Error::new(ErrorKind::InvalidData, "No version found", StatusCode::BadRequest)))?;
     if version != 1 {
-        return Err("Unsupported HTTP version".into());
+        return Err(Error::new(ErrorKind::InvalidData, "Unsupported HTTP version", StatusCode::BadRequest));
     }
     use std::convert::TryFrom;
     let mut res = Response::new(StatusCode::try_from(code)?);
@@ -153,7 +152,7 @@ where
 
     if content_length.is_some() && transfer_encoding.is_some() {
         // This is always an error.
-        return Err(HttpError::UnexpectedContentLengthHeader.into());
+        return Err(Error::new(ErrorKind::InvalidData, "Unexpected Content-Length header", StatusCode::BadRequest));
     }
 
     // Check for Transfer-Encoding

src/error.rs

@@ -39,9 +39,6 @@ const MAX_HEADERS: usize = 128;
 pub use check::check;
 
 mod check;
-mod error;
-
-pub use crate::error::HttpError;
 
 pub mod client;
 pub mod server;

src/lib.rs

@@ -11,11 +11,10 @@ use async_std::prelude::*;
 use async_std::task::{Context, Poll};
 use futures_core::ready;
 use http_types::headers::{HeaderName, HeaderValue, CONTENT_LENGTH, TRANSFER_ENCODING};
-use http_types::{Body, Method, Request, Response};
+use http_types::{Body, Method, Request, Response, StatusCode, Error, ErrorKind};
 
 use crate::chunked::ChunkedDecoder;
 use crate::date::fmt_http_date;
-use crate::error::HttpError;
 use crate::{Exception, MAX_HEADERS};
 
 const CR: u8 = b'\r';
@@ -24,7 +23,7 @@ const LF: u8 = b'\n';
 /// Parse an incoming HTTP connection.
 ///
 /// Supports `KeepAlive` requests by default.
-pub async fn accept<RW, F, Fut>(addr: &str, mut io: RW, endpoint: F) -> Result<(), Exception>
+pub async fn accept<RW, F, Fut>(addr: &str, mut io: RW, endpoint: F) -> http_types::Result<()>
 where
     RW: Read + Write + Clone + Send + Sync + Unpin + 'static,
     F: Fn(Request) -> Fut,
@@ -56,7 +55,7 @@ where
             req = match timeout(timeout_duration, decode(addr, io.clone())).await {
                 Ok(Ok(Some(r))) => r,
                 Ok(Ok(None)) | Err(TimeoutError { .. }) => break, /* EOF or timeout */
-                Ok(Err(e)) => return Err(e),
+                Ok(Err(e)) => return Err(e).into(),
             };
             // Loop back with the new request and stream and start again
         }
@@ -336,7 +335,7 @@ impl Read for Encoder {
 const HTTP_1_1_VERSION: u8 = 1;
 
 /// Decode an HTTP request on the server.
-async fn decode<R>(addr: &str, reader: R) -> Result<Option<Request>, Exception>
+async fn decode<R>(addr: &str, reader: R) -> Result<Option<Request>, Error>
 where
     R: Read + Unpin + Send + Sync + 'static,
 {
@@ -388,7 +387,7 @@ where
 
     if content_length.is_some() && transfer_encoding.is_some() {
         // This is always an error.
-        return Err(HttpError::UnexpectedContentLengthHeader.into());
+        return Err(Error::new(ErrorKind::InvalidData, "Unexpected Content-Length header", StatusCode::BadRequest));
     }
 
     // Check for Transfer-Encoding

src/server.rs

@@ -63,7 +63,7 @@ impl TestCase {
         expected
     }
 
-    pub async fn assert(self) {
+    pub(crate) async fn assert(self) {
         let mut actual = self.read_result().await;
         let mut expected = self.read_expected().await;
         assert!(!actual.is_empty(), "Received empty reply");