apply suggestions from review

Author: Vaiz

crates/ohno/src/app/macros.rs

@@ -3,63 +3,6 @@
 
 //! Macros for the `app` module.
 
-/// Return early with an [`AppError`](crate::AppError).
-///
-/// The macro accepts:
-/// - A string literal: `bail!("error message")`
-/// - An error expression: `bail!(MyAppError::new())`
-/// - A format string with arguments: `bail!("error: {value}")`
-///
-/// # Examples
-///
-/// ```rust
-/// use ohno::{AppError, bail};
-///
-/// fn check_value(x: i32) -> Result<(), AppError> {
-///     if x < 0 {
-///         bail!("value must be non-negative, got {x}");
-///     }
-///     Ok(())
-/// }
-/// ```
-///
-/// ```rust
-/// use ohno::{AppError, bail};
-///
-/// fn parse_config(data: &str) -> Result<(), AppError> {
-///    if data.is_empty() {
-///        bail!("config data cannot be empty");
-///    }
-///    Ok(())
-/// }
-/// ```
-///
-/// Bailing with an expression:
-///
-/// ```rust
-/// use ohno::{AppError, bail};
-///
-/// fn read_file(path: &str) -> Result<String, AppError> {
-///     bail!(std::io::Error::from(std::io::ErrorKind::PermissionDenied));
-/// }
-/// ```
-#[macro_export]
-#[cfg_attr(docsrs, doc(cfg(feature = "app-err")))]
-macro_rules! bail {
-    ($msg:literal $(,)?) => {
-        return Err($crate::AppError::new(format!($msg)))
-    };
-    ($fmt:expr, $($arg:tt)*) => {
-        return Err($crate::AppError::new(format!($fmt, $($arg)*)))
-    };
-    ($err:ident $(,)?) => {
-        return Err($crate::AppError::new($err))
-    };
-    ($err:expr $(,)?) => {
-        return Err($crate::AppError::new($err))
-    };
-}
-
 /// Construct an [`AppError`](crate::AppError) in place.
 ///
 /// The macro accepts:
@@ -113,3 +56,51 @@ macro_rules! app_err {
         $crate::AppError::new($err)
     };
 }
+
+/// Return early with an [`AppError`](crate::AppError).
+///
+/// The macro accepts:
+/// - A string literal: `bail!("error message")`
+/// - An error expression: `bail!(MyAppError::new())`
+/// - A format string with arguments: `bail!("error: {value}")`
+///
+/// # Examples
+///
+/// ```rust
+/// use ohno::{AppError, bail};
+///
+/// fn check_value(x: i32) -> Result<(), AppError> {
+///     if x < 0 {
+///         bail!("value must be non-negative, got {x}");
+///     }
+///     Ok(())
+/// }
+/// ```
+///
+/// ```rust
+/// use ohno::{AppError, bail};
+///
+/// fn parse_config(data: &str) -> Result<(), AppError> {
+///    if data.is_empty() {
+///        bail!("config data cannot be empty");
+///    }
+///    Ok(())
+/// }
+/// ```
+///
+/// Bailing with an expression:
+///
+/// ```rust
+/// use ohno::{AppError, bail};
+///
+/// fn read_file(path: &str) -> Result<String, AppError> {
+///     bail!(std::io::Error::from(std::io::ErrorKind::PermissionDenied));
+/// }
+/// ```
+#[macro_export]
+#[cfg_attr(docsrs, doc(cfg(feature = "app-err")))]
+macro_rules! bail{
+    ($($arg:tt)*) => (
+        return Err($crate::app_err!($($arg)*))
+    );
+}