diff options
Diffstat (limited to 'crates/shirabe/src/autoload')
| -rw-r--r-- | crates/shirabe/src/autoload/autoload_generator.rs | 10 | ||||
| -rw-r--r-- | crates/shirabe/src/autoload/class_loader.rs | 16 |
2 files changed, 8 insertions, 18 deletions
diff --git a/crates/shirabe/src/autoload/autoload_generator.rs b/crates/shirabe/src/autoload/autoload_generator.rs index aacbfc0f..4eae319d 100644 --- a/crates/shirabe/src/autoload/autoload_generator.rs +++ b/crates/shirabe/src/autoload/autoload_generator.rs @@ -815,19 +815,13 @@ return array( { let name = package.get_name(); let _ = package.get_target_dir(); - return Err(InvalidArgumentException { - message: format!("PSR-4 autoloading is incompatible with the target-dir property, remove the target-dir in package '{}'.", name), - code: 0, - } + return Err(InvalidArgumentException::new(format!("PSR-4 autoloading is incompatible with the target-dir property, remove the target-dir in package '{}'.", name)) .into()); } if let Some(psr4) = autoload.get("psr-4").and_then(|v| v.as_array()) { for (namespace, _dirs) in psr4 { if !namespace.is_empty() && !namespace.ends_with('\\') { - return Err(InvalidArgumentException { - message: format!("psr-4 namespaces must end with a namespace separator, '{}' does not, use '{}\\'.", namespace, namespace), - code: 0, - } + return Err(InvalidArgumentException::new(format!("psr-4 namespaces must end with a namespace separator, '{}' does not, use '{}\\'.", namespace, namespace)) .into()); } } diff --git a/crates/shirabe/src/autoload/class_loader.rs b/crates/shirabe/src/autoload/class_loader.rs index 89758269..47b6ee4c 100644 --- a/crates/shirabe/src/autoload/class_loader.rs +++ b/crates/shirabe/src/autoload/class_loader.rs @@ -175,11 +175,9 @@ impl ClassLoader { // Register directories for a new namespace. let length = strlen(prefix); if "\\" != &prefix[(length as usize - 1)..(length as usize)] { - return Err(InvalidArgumentException { - message: "A non-empty PSR-4 prefix must end with a namespace separator." - .to_string(), - code: 0, - } + return Err(InvalidArgumentException::new( + "A non-empty PSR-4 prefix must end with a namespace separator.".to_string(), + ) .into()); } let first = prefix.chars().next().unwrap_or('\0').to_string(); @@ -226,11 +224,9 @@ impl ClassLoader { } else { let length = strlen(prefix); if "\\" != &prefix[(length as usize - 1)..(length as usize)] { - return Err(InvalidArgumentException { - message: "A non-empty PSR-4 prefix must end with a namespace separator." - .to_string(), - code: 0, - } + return Err(InvalidArgumentException::new( + "A non-empty PSR-4 prefix must end with a namespace separator.".to_string(), + ) .into()); } let first = prefix.chars().next().unwrap_or('\0').to_string(); |