marcel/winapps
1
0
Fork 0
mirror of https://github.com/winapps-org/winapps.git synced 2025-06-06 15:17:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: use $crate instead of crate

Browse Source
This commit is contained in:
Oskar Manhart 2023-10-09 19:11:10 +02:00
parent c4603c8a89
commit 90079a4982
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
winapps/src/errors.rs
View File

@ -1,5 +1,3 @@
#![allow(clippy::crate_in_macro_def)]
use std::error::Error; use std::error::Error;
use std::fmt::Debug; use std::fmt::Debug;
use std::process::exit; use std::process::exit;
@ -51,7 +49,7 @@ impl WinappsError {
#[macro_export] #[macro_export]
macro_rules! error { macro_rules! error {
($($fmt:tt)*) => { ($($fmt:tt)*) => {
crate::errors::WinappsError::Message(format!($($fmt)*)) $crate::errors::WinappsError::Message(format!($($fmt)*))
}; };
} }
@ -61,7 +59,7 @@ macro_rules! error {
#[macro_export] #[macro_export]
macro_rules! error_from { macro_rules! error_from {
($err:expr, $($fmt:tt)*) => { ($err:expr, $($fmt:tt)*) => {
crate::errors::WinappsError::WithError(anyhow::Error::new($err), format!($($fmt)*)) $crate::errors::WinappsError::WithError(anyhow::Error::new($err), format!($($fmt)*))
}; };
} }
@ -123,10 +121,10 @@ where
#[macro_export] #[macro_export]
macro_rules! unwrap_or_exit { macro_rules! unwrap_or_exit {
($expr:expr) => {{ ($expr:expr) => {{
crate::errors::unwrap_or_exit($expr, "Expected a value, got None / Error".into()) $crate::errors::unwrap_or_exit($expr, "Expected a value, got None / Error".into())
}}; }};
($expr:expr, $($fmt:tt)*) => {{ ($expr:expr, $($fmt:tt)*) => {{
crate::errors::unwrap_or_exit($expr, format!($($fmt)*)) $crate::errors::unwrap_or_exit($expr, format!($($fmt)*))
}}; }};
} }
@ -137,9 +135,9 @@ macro_rules! unwrap_or_exit {
#[macro_export] #[macro_export]
macro_rules! unwrap_or_panic { macro_rules! unwrap_or_panic {
($expr:expr) => {{ ($expr:expr) => {{
crate::errors::unwrap_or_panic($expr, "Expected a value, got None / Error".into()) $crate::errors::unwrap_or_panic($expr, "Expected a value, got None / Error".into())
}}; }};
($expr:expr, $($fmt:tt)*) => {{ ($expr:expr, $($fmt:tt)*) => {{
crate::errors::unwrap_or_panic($expr, format!($($fmt)*)) $crate::errors::unwrap_or_panic($expr, format!($($fmt)*))
}}; }};
} }