Remove all ParseError instances.

Author: yoshuawuyts

src/headers/header_value.rs

@@ -1,7 +1,7 @@
 use std::fmt::{self, Display};
 use std::str::FromStr;
 
-use crate::headers::ParseError;
+use crate::{Error, ErrorKind};
 use crate::{Cookie, Mime};
 
 /// A header value.
@@ -16,9 +16,9 @@ impl HeaderValue {
     /// # Error
     ///
     /// This function will error if the string is not a valid ASCII.
-    pub fn from_ascii(bytes: &[u8]) -> Result<Self, ParseError> {
+    pub fn from_ascii(bytes: &[u8]) -> Result<Self, Error> {
         if !bytes.is_ascii() {
-            return Err(ParseError::new());
+            return Err(Error::from(ErrorKind::InvalidData));
         }
 
         // This is permitted because ASCII is valid UTF-8, and we just checked that.
@@ -71,14 +71,14 @@ impl From<&Mime> for HeaderValue {
 }
 
 impl FromStr for HeaderValue {
-    type Err = ParseError;
+    type Err = Error;
 
     /// Create a new `HeaderValue`.
     ///
     /// This checks it's valid ASCII.
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         if !s.is_ascii() {
-            return Err(ParseError::new());
+            return Err(Error::from(ErrorKind::InvalidData));
         }
         Ok(Self {
             inner: String::from(s),

src/headers/mod.rs

@@ -15,7 +15,6 @@ mod into_iter;
 mod iter;
 mod iter_mut;
 mod names;
-mod parse_error;
 mod to_header_values;
 mod values;
 
@@ -26,7 +25,6 @@ pub use into_iter::IntoIter;
 pub use iter::Iter;
 pub use iter_mut::IterMut;
 pub use names::Names;
-pub use parse_error::ParseError;
 pub use to_header_values::ToHeaderValues;
 pub use values::Values;
 

src/headers/parse_error.rs

@@ -1,7 +1,8 @@
-use std::error::Error;
 use std::fmt::{self, Display};
 use std::str::FromStr;
 
+use crate::{Error, ErrorKind};
+
 /// HTTP request methods.
 ///
 /// [Read more](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods)
@@ -67,22 +68,8 @@ impl Display for Method {
     }
 }
 
-/// An error returned when failing to convert into a status code.
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub struct ParseError {
-    _private: (),
-}
-
-impl Error for ParseError {}
-
-impl Display for ParseError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        "Error parsing a string into a status code".fmt(f)
-    }
-}
-
 impl FromStr for Method {
-    type Err = ParseError;
+    type Err = crate::Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
@@ -95,7 +82,7 @@ impl FromStr for Method {
             "OPTIONS" => Ok(Self::Options),
             "TRACE" => Ok(Self::Trace),
             "PATCH" => Ok(Self::Patch),
-            _ => Err(ParseError { _private: () }),
+            _ => Err(Error::from(ErrorKind::InvalidData)),
         }
     }
 }

src/method.rs

@@ -13,8 +13,8 @@ use std::io;
 use std::option;
 use std::str::FromStr;
 
-use crate::headers::{HeaderValue, ParseError, ToHeaderValues};
-use crate::Error;
+use crate::headers::{HeaderValue, ToHeaderValues};
+use crate::{Error, ErrorKind};
 use crate::StatusCode;
 
 use infer::Infer;
@@ -130,14 +130,14 @@ impl Debug for Mime {
 }
 
 impl FromStr for Mime {
-    type Err = ParseError;
+    type Err = crate::Error;
 
     /// Create a new `HeaderName`.
     ///
     /// This checks it's valid ASCII, and lowercases it.
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         if !s.is_ascii() {
-            return Err(ParseError::new());
+            return Err(Error::from(ErrorKind::InvalidData));
         }
         Ok(Self {
             essence: s.to_ascii_lowercase(),

src/mime/mod.rs

@@ -68,7 +68,7 @@ impl Request {
     /// # Examples
     ///
     /// ```
-    /// # fn main() -> Result<(), http_types::url::ParseError> {
+    /// # fn main() -> Result<(), http_types::Error> {
     /// #
     /// use http_types::{Url, Method, Request, Response, StatusCode};
     /// let mut req = Request::new(Method::Get, Url::parse("https://example.com")?);
@@ -85,7 +85,7 @@ impl Request {
     /// # Examples
     ///
     /// ```
-    /// # fn main() -> Result<(), http_types::url::ParseError> {
+    /// # fn main() -> Result<(), http_types::Error> {
     /// #
     /// use http_types::{Url, Method, Request, Response, StatusCode};
     /// let mut req = Request::new(Method::Get, Url::parse("https://example.com")?);
@@ -289,7 +289,7 @@ impl Request {
     /// ```
     /// use http_types::{Url, Method, Request, Version};
     ///
-    /// # fn main() -> Result<(), http_types::url::ParseError> {
+    /// # fn main() -> Result<(), http_types::Error> {
     /// #
     /// let mut req = Request::new(Method::Get, Url::parse("https://example.com")?);
     /// assert_eq!(req.version(), None);
@@ -310,7 +310,7 @@ impl Request {
     /// ```
     /// use http_types::{Url, Method, Request, Version};
     ///
-    /// # fn main() -> Result<(), http_types::url::ParseError> {
+    /// # fn main() -> Result<(), http_types::Error> {
     /// #
     /// let mut req = Request::new(Method::Get, Url::parse("https://example.com")?);
     /// req.set_version(Some(Version::Http2_0));
@@ -326,7 +326,7 @@ impl Request {
     /// # Examples
     ///
     /// ```
-    /// # fn main() -> Result<(), http_types::url::ParseError> {
+    /// # fn main() -> Result<(), http_types::Error> {
     /// #
     /// use http_types::{Cookie, Url, Method, Request, Version};
     ///
@@ -336,7 +336,7 @@ impl Request {
     /// #
     /// # Ok(()) }
     /// ```
-    pub fn cookies(&self) -> Result<Vec<Cookie<'_>>, cookie::ParseError> {
+    pub fn cookies(&self) -> Result<Vec<Cookie<'_>>, crate::Error> {
         match self.header(&headers::COOKIE) {
             None => Ok(vec![]),
             Some(h) => h.iter().try_fold(vec![], |mut acc, h| {
@@ -352,7 +352,7 @@ impl Request {
     /// # Examples
     ///
     /// ```
-    /// # fn main() -> Result<(), http_types::url::ParseError> {
+    /// # fn main() -> Result<(), http_types::Error> {
     /// #
     /// use http_types::{Cookie, Url, Method, Request, Version};
     ///
@@ -362,7 +362,7 @@ impl Request {
     /// #
     /// # Ok(()) }
     /// ```
-    pub fn cookie(&self, name: &str) -> Result<Option<Cookie<'_>>, cookie::ParseError> {
+    pub fn cookie(&self, name: &str) -> Result<Option<Cookie<'_>>, crate::Error> {
         let cookies = self.cookies()?;
         let cookie = cookies.into_iter().filter(|c| c.name() == name).next();
         Ok(cookie)
@@ -375,7 +375,7 @@ impl Request {
     /// # Examples
     ///
     /// ```
-    /// # fn main() -> Result<(), http_types::url::ParseError> {
+    /// # fn main() -> Result<(), http_types::Error> {
     /// #
     /// use http_types::{Cookie, Url, Method, Request, Version};
     ///

src/request.rs

@@ -19,7 +19,7 @@ pin_project_lite::pin_project! {
     /// # Examples
     ///
     /// ```
-    /// # fn main() -> Result<(), http_types::url::ParseError> {
+    /// # fn main() -> Result<(), http_types::Error> {
     /// #
     /// use http_types::{Response, StatusCode};
     ///
@@ -126,7 +126,7 @@ impl Response {
     /// # Examples
     ///
     /// ```
-    /// # fn main() -> Result<(), http_types::url::ParseError> {
+    /// # fn main() -> Result<(), http_types::Error> {
     /// #
     /// use http_types::{Response, StatusCode};
     ///
@@ -248,7 +248,7 @@ impl Response {
     /// # Examples
     ///
     /// ```
-    /// # fn main() -> Result<(), http_types::url::ParseError> {
+    /// # fn main() -> Result<(), http_types::Error> {
     /// #
     /// use http_types::{Response, StatusCode, Version};
     ///
@@ -269,7 +269,7 @@ impl Response {
     /// # Examples
     ///
     /// ```
-    /// # fn main() -> Result<(), http_types::url::ParseError> {
+    /// # fn main() -> Result<(), http_types::Error> {
     /// #
     /// use http_types::{Response, StatusCode, Version};
     ///
@@ -292,7 +292,7 @@ impl Response {
     /// # Examples
     ///
     /// ```
-    /// # fn main() -> Result<(), http_types::url::ParseError> {
+    /// # fn main() -> Result<(), http_types::Error> {
     /// #
     /// use http_types::{Cookie, Response, StatusCode, Version};
     ///
@@ -302,7 +302,7 @@ impl Response {
     /// #
     /// # Ok(()) }
     /// ```
-    pub fn cookies(&self) -> Result<Vec<Cookie<'_>>, cookie::ParseError> {
+    pub fn cookies(&self) -> Result<Vec<Cookie<'_>>, crate::Error> {
         match self.header(&headers::SET_COOKIE) {
             None => Ok(vec![]),
             Some(h) => h.iter().try_fold(vec![], |mut acc, h| {
@@ -318,7 +318,7 @@ impl Response {
     /// # Examples
     ///
     /// ```
-    /// # fn main() -> Result<(), http_types::url::ParseError> {
+    /// # fn main() -> Result<(), http_types::Error> {
     /// #
     /// use http_types::{Cookie, Response, StatusCode, Version};
     ///
@@ -328,7 +328,7 @@ impl Response {
     /// #
     /// # Ok(()) }
     /// ```
-    pub fn cookie(&self, name: &str) -> Result<Option<Cookie<'_>>, cookie::ParseError> {
+    pub fn cookie(&self, name: &str) -> Result<Option<Cookie<'_>>, crate::Error> {
         let cookies = self.cookies()?;
         let cookie = cookies.into_iter().filter(|c| c.name() == name).next();
         Ok(cookie)
@@ -341,7 +341,7 @@ impl Response {
     /// # Examples
     ///
     /// ```
-    /// # fn main() -> Result<(), http_types::url::ParseError> {
+    /// # fn main() -> Result<(), http_types::Error> {
     /// #
     /// use http_types::{Cookie, Response, StatusCode, Version};
     ///