feedback from review

Author: yoshuawuyts

src/auth/authentication_scheme.rs

@@ -1,7 +1,7 @@
 use std::fmt::{self, Display};
 use std::str::FromStr;
 
-use crate::bail2 as bail;
+use crate::bail_status as bail;
 
 /// HTTP Mutual Authentication Algorithms
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]

src/auth/authorization.rs

@@ -1,5 +1,5 @@
 use crate::auth::AuthenticationScheme;
-use crate::bail2 as bail;
+use crate::bail_status as bail;
 use crate::headers::{HeaderName, HeaderValue, Headers, AUTHORIZATION};
 
 /// Credentials to authenticate a user agent with a server.

src/auth/basic_auth.rs

@@ -1,7 +1,7 @@
 use crate::auth::{AuthenticationScheme, Authorization};
 use crate::headers::{HeaderName, HeaderValue, Headers, AUTHORIZATION};
 use crate::Status;
-use crate::{bail2 as bail, ensure2 as ensure};
+use crate::{bail_status as bail, ensure_status as ensure};
 
 /// HTTP Basic authorization.
 ///
@@ -73,7 +73,7 @@ impl BasicAuth {
 
         let (username, password) = match (username, password) {
             (Some(username), Some(password)) => (username.to_string(), password.to_string()),
-            (Some(_), None) => bail!(400, "Expected basic auth to a password"),
+            (Some(_), None) => bail!(400, "Expected basic auth to contain a password"),
             (None, _) => bail!(400, "Expected basic auth to contain a username"),
         };
 

src/auth/www_authenticate.rs

@@ -1,5 +1,5 @@
 use crate::auth::AuthenticationScheme;
-use crate::bail2 as bail;
+use crate::bail_status as bail;
 use crate::headers::{HeaderName, HeaderValue, Headers, WWW_AUTHENTICATE};
 
 /// Define the authentication method that should be used to gain access to a

src/macros.rs

@@ -88,15 +88,15 @@ macro_rules! format_err {
 /// Return early with an error and a status code.
 #[doc(hidden)]
 #[macro_export]
-macro_rules! bail2 {
+macro_rules! bail_status {
     ($status:literal, $msg:literal $(,)?) => {{
-        return $crate::private::Err($crate::format_err2!($status, $msg));
+        return $crate::private::Err($crate::format_err_status!($status, $msg));
     }};
     ($status:literal, $msg:expr $(,)?) => {
-        return $crate::private::Err($crate::format_err2!($status, $msg));
+        return $crate::private::Err($crate::format_err_status!($status, $msg));
     };
     ($status:literal, $msg:expr, $($arg:tt)*) => {
-        return $crate::private::Err($crate::format_err2!($status, $msg, $($arg)*));
+        return $crate::private::Err($crate::format_err_status!($status, $msg, $($arg)*));
     };
 }
 
@@ -109,20 +109,20 @@ macro_rules! bail2 {
 /// rather than panicking.
 #[doc(hidden)]
 #[macro_export]
-macro_rules! ensure2 {
+macro_rules! ensure_status {
     ($cond:expr, $status:literal, $msg:literal $(,)?) => {
         if !$cond {
-            return $crate::private::Err($crate::format_err2!($status, $msg));
+            return $crate::private::Err($crate::format_err_status!($status, $msg));
         }
     };
     ($cond:expr, $status:literal, $msg:expr $(,)?) => {
         if !$cond {
-            return $crate::private::Err($crate::format_err2!($status, $msg));
+            return $crate::private::Err($crate::format_err_status!($status, $msg));
         }
     };
     ($cond:expr, $status:literal, $msg:expr, $($arg:tt)*) => {
         if !$cond {
-            return $crate::private::Err($crate::format_err2!($status, $msg, $($arg)*));
+            return $crate::private::Err($crate::format_err_status!($status, $msg, $($arg)*));
         }
     };
 }
@@ -136,20 +136,20 @@ macro_rules! ensure2 {
 /// rather than panicking.
 #[doc(hidden)]
 #[macro_export]
-macro_rules! ensure_eq2 {
+macro_rules! ensure_eq_status {
     ($left:expr, $right:expr, $status:literal, $msg:literal $(,)?) => {
         if $left != $right {
-            return $crate::private::Err($crate::format_err2!($status, $msg));
+            return $crate::private::Err($crate::format_err_status!($status, $msg));
         }
     };
     ($left:expr, $right:expr, $status:literal, $msg:expr $(,)?) => {
         if $left != $right {
-            return $crate::private::Err($crate::format_err2!($status, $msg));
+            return $crate::private::Err($crate::format_err_status!($status, $msg));
         }
     };
     ($left:expr, $right:expr, $status:literal, $msg:expr, $($arg:tt)*) => {
         if $left != $right {
-            return $crate::private::Err($crate::format_err2!($status, $msg, $($arg)*));
+            return $crate::private::Err($crate::format_err_status!($status, $msg, $($arg)*));
         }
     };
 }
@@ -161,7 +161,7 @@ macro_rules! ensure_eq2 {
 /// `Debug` and `Display`.
 #[doc(hidden)]
 #[macro_export]
-macro_rules! format_err2 {
+macro_rules! format_err_status {
     ($status:literal, $msg:literal $(,)?) => {{
         // Handle $:literal as a special case to make cargo-expanded code more
         // concise in the common case.