Allow conversions in ResultExt::status

Author: yoshuawuyts

src/result_ext.rs

@@ -1,5 +1,5 @@
 use crate::{Error, StatusCode};
-use core::convert::Infallible;
+use core::convert::{Infallible, TryInto};
 use std::error::Error as StdError;
 
 /// Provides the `status` method for `Result`.
@@ -9,46 +9,68 @@ pub trait ResultExt<T, E>: private::Sealed {
     /// Wrap the error value with an additional status code.
     fn status<S>(self, status: S) -> Result<T, Error>
     where
-        S: Into<StatusCode>;
+        S: TryInto<StatusCode>,
+        S::Error: std::fmt::Debug;
 
     /// Wrap the error value with an additional status code that is evaluated
     /// lazily only once an error does occur.
     fn with_status<S, F>(self, f: F) -> Result<T, Error>
     where
-        S: Into<StatusCode>,
+        S: TryInto<StatusCode>,
+        S::Error: std::fmt::Debug,
         F: FnOnce() -> S;
 }
 
 impl<T, E> ResultExt<T, E> for Result<T, E>
 where
     E: StdError + Send + Sync + 'static,
 {
-    fn status<S>(self, status: S) -> Result<T, Error> where
-    S: Into<StatusCode> {
-        self.map_err(|error| Error::new(status.into(), error))
+    fn status<S>(self, status: S) -> Result<T, Error>
+    where
+        S: TryInto<StatusCode>,
+        S::Error: std::fmt::Debug,
+    {
+        self.map_err(|error| {
+            let status = status.try_into().unwrap();
+            Error::new(status, error)
+        })
     }
 
     fn with_status<S, F>(self, f: F) -> Result<T, Error>
     where
-        S: Into<StatusCode>,
+        S: TryInto<StatusCode>,
+        S::Error: std::fmt::Debug,
         F: FnOnce() -> S,
     {
-        self.map_err(|error| Error::new(f().into(), error))
+        self.map_err(|error| {
+            let status = f().try_into().unwrap();
+            Error::new(status, error)
+        })
     }
 }
 
 impl<T> ResultExt<T, Infallible> for Option<T> {
-    fn status<S>(self, status: S) -> Result<T, Error> 
-    where S: Into<StatusCode> {
-        self.ok_or_else(|| Error::from_str(status.into(), "NoneError"))
+    fn status<S>(self, status: S) -> Result<T, Error>
+    where
+        S: TryInto<StatusCode>,
+        S::Error: std::fmt::Debug,
+    {
+        self.ok_or_else(|| {
+            let status = status.try_into().unwrap();
+            Error::from_str(status, "NoneError")
+        })
     }
 
     fn with_status<S, F>(self, f: F) -> Result<T, Error>
     where
-        S: Into<StatusCode>,
+        S: TryInto<StatusCode>,
+        S::Error: std::fmt::Debug,
         F: FnOnce() -> S,
     {
-        self.ok_or_else(|| Error::from_str(f().into(), "NoneError"))
+        self.ok_or_else(|| {
+            let status = f().try_into().unwrap();
+            Error::from_str(status, "NoneError")
+        })
     }
 }
 

src/status_code.rs

@@ -475,8 +475,8 @@ impl Into<u16> for &StatusCode {
 impl std::convert::TryFrom<u16> for StatusCode {
     type Error = crate::Error;
 
-    fn try_from(value: u16) -> Result<Self, Self::Error> {
-        match value {
+    fn try_from(num: u16) -> Result<Self, Self::Error> {
+        match num {
             100 => Ok(StatusCode::Continue),
             101 => Ok(StatusCode::SwitchingProtocols),
             103 => Ok(StatusCode::EarlyHints),
@@ -530,7 +530,7 @@ impl std::convert::TryFrom<u16> for StatusCode {
             506 => Ok(StatusCode::VariantAlsoNegotiates),
             510 => Ok(StatusCode::NotExtended),
             511 => Ok(StatusCode::NetworkAuthenticationRequired),
-            _ => unimplemented!(), // TODO: return parser error
+            _ => crate::bail!("Invalid status code"),
         }
     }
 }