min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify Error::reason()

This commit is contained in:
Kornel 2025-10-01 10:40:05 +01:00 committed by Alessandro Ghedini
parent 75ef523230
commit 77f612c16c
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
boring/src/error.rs
View File

@ -103,7 +103,7 @@ impl fmt::Display for ErrorStack {
write!( write!(
fmt, fmt,
"[{}]", "[{}]",
err.reason_internal() err.reason()
.or_else(|| err.library()) .or_else(|| err.library())
.unwrap_or("unknown reason") .unwrap_or("unknown reason")
)?; )?;
@ -252,7 +252,10 @@ impl Error {
/// Returns the reason for the error. /// Returns the reason for the error.
#[must_use] #[must_use]
pub fn reason(&self) -> Option<&'static str> { pub fn reason(&self) -> Option<&str> {
if self.is_internal() {
return self.data();
}
unsafe { unsafe {
let cstr = ffi::ERR_reason_error_string(self.code); let cstr = ffi::ERR_reason_error_string(self.code);
if cstr.is_null() { if cstr.is_null() {
@ -330,15 +333,6 @@ impl Error {
fn is_internal(&self) -> bool { fn is_internal(&self) -> bool {
std::ptr::eq(self.file, BORING_INTERNAL.as_ptr()) std::ptr::eq(self.file, BORING_INTERNAL.as_ptr())
} }
// reason() needs 'static
fn reason_internal(&self) -> Option<&str> {
if self.is_internal() {
self.data()
} else {
self.reason()
}
}
} }
impl fmt::Debug for Error { impl fmt::Debug for Error {
@ -369,7 +363,7 @@ impl fmt::Display for Error {
write!( write!(
fmt, fmt,
"{}\n\nCode: {:08X}\nLoc: {}:{}", "{}\n\nCode: {:08X}\nLoc: {}:{}",
self.reason_internal().unwrap_or("unknown TLS error"), self.reason().unwrap_or("unknown TLS error"),
&self.code, &self.code,
self.file(), self.file(),
self.line() self.line()