add error_and_panic helper for logerr
This commit is contained in:
parent
7498338b9e
commit
d1fcf0ac89
|
@ -2,6 +2,14 @@ use std::{error::Error, fmt::Debug};
|
||||||
|
|
||||||
use log::{debug, error};
|
use log::{debug, error};
|
||||||
|
|
||||||
|
// So we still get a useful panic when logs are filtered
|
||||||
|
macro_rules! error_and_panic {
|
||||||
|
($($arg:tt)*) => {
|
||||||
|
log::error!($($arg)*);
|
||||||
|
panic!($($arg)*);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
pub trait UnwrapLog {
|
pub trait UnwrapLog {
|
||||||
type Target;
|
type Target;
|
||||||
|
|
||||||
|
@ -35,8 +43,7 @@ where
|
||||||
match self {
|
match self {
|
||||||
Ok(target) => target,
|
Ok(target) => target,
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
error!("called `Result::unwrap_log()` on an `Err` value: {err}");
|
error_and_panic!("called `Result::unwrap_log()` on an `Err` value: {err}");
|
||||||
panic!("called `Result::unwrap_log()` on an `Err` value: {err}");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -45,8 +52,9 @@ where
|
||||||
match self {
|
match self {
|
||||||
Ok(target) => target,
|
Ok(target) => target,
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
error!("[{expect}] called `Result::expect_log()` on an `Err` value: {err}");
|
error_and_panic!(
|
||||||
panic!("[{expect}] called `Result::expect_log()` on an `Err` value: {err}");
|
"[{expect}] called `Result::expect_log()` on an `Err` value: {err}"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -76,8 +84,7 @@ where
|
||||||
match self {
|
match self {
|
||||||
Some(target) => target,
|
Some(target) => target,
|
||||||
None => {
|
None => {
|
||||||
error!("called `Option::unwrap_log()` on a `None` value");
|
error_and_panic!("called `Option::unwrap_log()` on a `None` value");
|
||||||
panic!("called `Option::unwrap_log()` on a `None` value");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -86,8 +93,7 @@ where
|
||||||
match self {
|
match self {
|
||||||
Some(target) => target,
|
Some(target) => target,
|
||||||
None => {
|
None => {
|
||||||
error!("[{expect}] called `Option::expect_log()` on an `None` value");
|
error_and_panic!("[{expect}] called `Option::expect_log()` on an `None` value");
|
||||||
panic!("[{expect}] called `Option::expect_log()` on an `None` value");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue