2 files changed, 14 insertions, 25 deletions
diff --git a/crates/shirabe/src/advisory/audit_config.rs b/crates/shirabe/src/advisory/audit_config.rs
index 71730317..fc1cbedb 100644
--- a/crates/shirabe/src/advisory/audit_config.rs
+++ b/crates/shirabe/src/advisory/audit_config.rs
@@ -103,13 +103,10 @@ impl AuditConfig {
                         .map(|s| s.to_string());
 
                     if !["audit", "block", "all"].contains(&apply.as_str()) {
-                        return Err(InvalidArgumentException {
-                            message: format!(
-                                "Invalid 'apply' value for '{}': {}. Expected 'audit', 'block', or 'all'.",
-                                key, apply
-                            ),
-                            code: 0,
-                        }.into());
+                        return Err(InvalidArgumentException::new(format!(
+                            "Invalid 'apply' value for '{}': {}. Expected 'audit', 'block', or 'all'.",
+                            key, apply
+                        )).into());
                     }
 
                     (key.clone(), apply, reason)
diff --git a/crates/shirabe/src/advisory/auditor.rs b/crates/shirabe/src/advisory/auditor.rs
index d20c9453..d661cf90 100644
--- a/crates/shirabe/src/advisory/auditor.rs
+++ b/crates/shirabe/src/advisory/auditor.rs
@@ -422,13 +422,10 @@ impl Auditor {
                         .map(|buffer_io| &buffer_io.inner)
                 });
                 if io_as_console.is_none() {
-                    return Err(InvalidArgumentException {
-                        message: format!(
-                            "Cannot use table format with {}",
-                            get_class(&PhpMixed::Null)
-                        ),
-                        code: 0,
-                    }
+                    return Err(InvalidArgumentException::new(format!(
+                        "Cannot use table format with {}",
+                        get_class(&PhpMixed::Null)
+                    ))
                     .into());
                 }
                 self.output_advisories_table(io_as_console.unwrap(), advisories)?;
@@ -441,11 +438,9 @@ impl Auditor {
                 Ok(())
             }
             Self::FORMAT_SUMMARY => Ok(()),
-            _ => Err(InvalidArgumentException {
-                message: format!("Invalid format \"{}\".", format),
-                code: 0,
+            _ => {
+                Err(InvalidArgumentException::new(format!("Invalid format \"{}\".", format)).into())
             }
-            .into()),
         }
     }
 
@@ -597,13 +592,10 @@ impl Auditor {
                 .map(|buffer_io| &buffer_io.inner)
         });
         if io_as_console.is_none() {
-            return Err(InvalidArgumentException {
-                message: format!(
-                    "Cannot use table format with {}",
-                    get_class(&PhpMixed::Null)
-                ),
-                code: 0,
-            }
+            return Err(InvalidArgumentException::new(format!(
+                "Cannot use table format with {}",
+                get_class(&PhpMixed::Null)
+            ))
             .into());
         }