oss/continuwuity
oss/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-07-29 03:08:31 +00:00
Code Wiki Activity

refactor Error::bad_config

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-12 07:41:01 +00:00
parent 93ec4e579b
commit 4cc92dd175
10 changed files with 71 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/core/error.rs
View file

@ -18,35 +18,36 @@ use crate::{debug::panic_str, debug_error, error};
#[macro_export]
macro_rules! err {
(error!($($args:tt),+)) => {{
error!($($args),+);
$crate::error::Error::Err(format!($($args),+))
$crate::error!($($args),+);
$crate::error::Error::Err(std::format!($($args),+))
}};
(debug_error!($($args:tt),+)) => {{
debug_error!($($args),+);
$crate::error::Error::Err(format!($($args),+))
$crate::debug_error!($($args),+);
$crate::error::Error::Err(std::format!($($args),+))
}};
($variant:ident(error!($($args:tt),+))) => {{
error!($($args),+);
$crate::error::Error::$variant(format!($($args),+))
$crate::error!($($args),+);
$crate::error::Error::$variant(std::format!($($args),+))
}};
($variant:ident(debug_error!($($args:tt),+))) => {{
debug_error!($($args),+);
$crate::error::Error::$variant(format!($($args),+))
$crate::debug_error!($($args),+);
$crate::error::Error::$variant(std::format!($($args),+))
}};
($variant:ident(format!($($args:tt),+))) => {
$crate::error::Error::$variant(format!($($args),+))
};
(Config($item:literal, $($args:tt),+)) => {{
$crate::error!(config = %$item, $($args),+);
$crate::error::Error::Config($item, std::format!($($args),+))
}};
($variant:ident($($args:tt),+)) => {
$crate::error::Error::$variant(format!($($args),+))
$crate::error::Error::$variant(std::format!($($args),+))
};
($string:literal$(,)? $($args:tt),*) => {
$crate::error::Error::Err(format!($string, $($args),*))
$crate::error::Error::Err(std::format!($string, $($args),*))
};
}
@ -123,8 +124,8 @@ pub enum Error {
// conduwuit
#[error("Arithmetic operation failed: {0}")]
Arithmetic(&'static str),
#[error("There was a problem with your configuration: {0}")]
BadConfig(String),
#[error("There was a problem with the '{0}' directive in your configuration: {1}")]
Config(&'static str, String),
#[error("{0}")]
BadDatabase(&'static str),
#[error("{0}")]
@ -145,11 +146,6 @@ impl Error {
Self::BadDatabase(message)
}
pub fn bad_config(message: &str) -> Self {
error!("BadConfig: {}", message);
Self::BadConfig(message.to_owned())
}
#[must_use]
pub fn from_panic(e: Box<dyn Any + Send>) -> Self { Self::Panic(panic_str(&e), e) }