Use http_types::Result

Author: yoshuawuyts

src/client.rs

@@ -4,7 +4,7 @@ use async_std::io::{self, BufReader, Read, Write};
 use async_std::prelude::*;
 use async_std::task::{Context, Poll};
 use futures_core::ready;
-use http_types::{ensure, ensure_eq, format_err, Error};
+use http_types::{ensure, ensure_eq, format_err};
 use http_types::{
     headers::{HeaderName, HeaderValue, CONTENT_LENGTH, DATE, TRANSFER_ENCODING},
     Body, Request, Response, StatusCode,
@@ -131,7 +131,7 @@ async fn encode(req: Request) -> http_types::Result<Encoder> {
 
 /// Decode an HTTP response on the client.
 #[doc(hidden)]
-pub async fn decode<R>(reader: R) -> Result<Response, Error>
+pub async fn decode<R>(reader: R) -> http_types::Result<Response>
 where
     R: Read + Unpin + Send + Sync + 'static,
 {

src/date.rs

@@ -2,7 +2,7 @@ use std::fmt::{self, Display, Formatter};
 use std::str::{from_utf8, FromStr};
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
-use http_types::{bail, ensure, format_err, Error};
+use http_types::{bail, ensure, format_err};
 
 const IMF_FIXDATE_LENGTH: usize = 29;
 const RFC850_MAX_LENGTH: usize = 23;
@@ -39,7 +39,7 @@ pub struct HttpDate {
 /// ascdate formats. Two digit years are mapped to dates between
 /// 1970 and 2069.
 #[allow(dead_code)]
-pub(crate) fn parse_http_date(s: &str) -> Result<SystemTime, Error> {
+pub(crate) fn parse_http_date(s: &str) -> http_types::Result<SystemTime> {
     s.parse::<HttpDate>().map(|d| d.into())
 }
 
@@ -66,7 +66,7 @@ impl HttpDate {
     }
 }
 
-fn parse_imf_fixdate(s: &[u8]) -> Result<HttpDate, Error> {
+fn parse_imf_fixdate(s: &[u8]) -> http_types::Result<HttpDate> {
     // Example: `Sun, 06 Nov 1994 08:49:37 GMT`
     if s.len() != IMF_FIXDATE_LENGTH
         || &s[25..] != b" GMT"
@@ -110,7 +110,7 @@ fn parse_imf_fixdate(s: &[u8]) -> Result<HttpDate, Error> {
     })
 }
 
-fn parse_rfc850_date(s: &[u8]) -> Result<HttpDate, Error> {
+fn parse_rfc850_date(s: &[u8]) -> http_types::Result<HttpDate> {
     // Example: `Sunday, 06-Nov-94 08:49:37 GMT`
     ensure!(
         s.len() >= RFC850_MAX_LENGTH,
@@ -165,7 +165,7 @@ fn parse_rfc850_date(s: &[u8]) -> Result<HttpDate, Error> {
     })
 }
 
-fn parse_asctime(s: &[u8]) -> Result<HttpDate, Error> {
+fn parse_asctime(s: &[u8]) -> http_types::Result<HttpDate> {
     // Example: `Sun Nov  6 08:49:37 1994`
     if s.len() != ASCTIME_LENGTH || s[10] != b' ' || s[13] != b':' || s[16] != b':' || s[19] != b' '
     {
@@ -326,7 +326,7 @@ impl From<HttpDate> for SystemTime {
 }
 
 impl FromStr for HttpDate {
-    type Err = Error;
+    type Err = http_types::Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         ensure!(s.is_ascii(), "String slice is not valid ASCII");

src/server.rs

@@ -12,7 +12,7 @@ use async_std::task::{Context, Poll};
 use futures_core::ready;
 use http_types::headers::{HeaderName, HeaderValue, CONTENT_LENGTH, TRANSFER_ENCODING};
 use http_types::{ensure, ensure_eq, format_err};
-use http_types::{Body, Error, Method, Request, Response};
+use http_types::{Body, Method, Request, Response};
 
 use crate::chunked::ChunkedDecoder;
 use crate::date::fmt_http_date;
@@ -28,7 +28,7 @@ pub async fn accept<RW, F, Fut>(addr: &str, mut io: RW, endpoint: F) -> http_typ
 where
     RW: Read + Write + Clone + Send + Sync + Unpin + 'static,
     F: Fn(Request) -> Fut,
-    Fut: Future<Output = Result<Response, Error>>,
+    Fut: Future<Output = http_types::Result<Response>>,
 {
     // TODO: make configurable
     let timeout_duration = Duration::from_secs(10);
@@ -336,7 +336,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>, Error>
+async fn decode<R>(addr: &str, reader: R) -> http_types::Result<Option<Request>>
 where
     R: Read + Unpin + Send + Sync + 'static,
 {