types: refactor Error's Debug impl

noib3 · Oct 1, 2023 · 2503fdb · 2503fdb
1 parent 11fa6b2
commit 2503fdb
Showing 1 changed file with 20 additions and 12 deletions.
diff --git a/crates/oxi-types/src/error.rs b/crates/oxi-types/src/error.rs
@@ -42,23 +42,31 @@ impl Default for Error {
 
 impl fmt::Debug for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fmt::Display::fmt(self, f)
+        if !self.msg.is_null() {
+            let msg = unsafe { CStr::from_ptr(self.msg) };
+
+            match self.r#type {
+                ErrorType::Exception => {
+                    f.debug_tuple("Exception").field(&msg).finish()
+                },
+                ErrorType::Validation => {
+                    f.debug_tuple("Validation").field(&msg).finish()
+                },
+                _ => fmt::Debug::fmt(msg, f),
+            }
+        } else if let ErrorType::Exception = self.r#type {
+            write!(f, "Exception")
+        } else if let ErrorType::Validation = self.r#type {
+            write!(f, "Validation")
+        } else {
+            Ok(())
+        }
     }
 }
 
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        if !self.msg.is_null() {
-            fmt::Debug::fmt(unsafe { CStr::from_ptr(self.msg) }, f)
-        } else {
-            use ErrorType::*;
-            let msg = match self.r#type {
-                None => return Ok(()),
-                Exception => "exception",
-                Validation => "validation",
-            };
-            write!(f, "{}", msg)
-        }
+        fmt::Debug::fmt(self, f)
     }
 }