From f4cad2123b2af0de72bda4ce039e16e74f163f4e Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 8 Aug 2026 22:14:12 +0900 Subject: feat(php-shim): give ported exceptions PHP's class hierarchy Ported exceptions were flat structs reached with `downcast_ref`, so Composer's `catch (\RuntimeException $e)` only matched the exact leaf type and `get_class($e)` had nothing to report. Each exception now embeds an instance of the class it extends and travels inside an `AnyThrowable`; `Catch::catch`/`catch_mut` walk that chain, and `PhpClass::php_class_name` yields the PHP FQCN. Dropping the `std::error::Error` impls from the exception types leaves `AnyThrowable` as the only route into an `anyhow::Error`, so the walk cannot be bypassed. A `no_exception_downcast` linter catches the `downcast::()` calls that would now silently answer `None`. Three sites change behavior as a result: the `TransportException` exit-code override reaches `MaxFileSizeExceededException`, the `catch (\LogicException)` in findSimilar() reaches its subclasses, and rendered exception titles carry the real class name rather than a guess. `get_class_err()` is no longer a `todo!()`, which re-enables FilesystemRepositoryTest::testCorruptedRepositoryFile. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/src/util/no_proxy_pattern.rs | 49 ++++++++++++----------------- 1 file changed, 20 insertions(+), 29 deletions(-) (limited to 'crates/shirabe/src/util/no_proxy_pattern.rs') diff --git a/crates/shirabe/src/util/no_proxy_pattern.rs b/crates/shirabe/src/util/no_proxy_pattern.rs index 582fdb68..83adb09f 100644 --- a/crates/shirabe/src/util/no_proxy_pattern.rs +++ b/crates/shirabe/src/util/no_proxy_pattern.rs @@ -153,27 +153,24 @@ impl NoProxyPattern { let mask = network.netmask.as_deref().unwrap_or_default(); let ip = target.ip.as_slice(); if net.is_empty() { - return Err(RuntimeException { - message: format!( - "Could not parse network IP {}", - String::from_utf8_lossy(net) - ), - code: 0, - } + return Err(RuntimeException::new(format!( + "Could not parse network IP {}", + String::from_utf8_lossy(net) + )) .into()); } if mask.is_empty() { - return Err(RuntimeException { - message: format!("Could not parse netmask {}", String::from_utf8_lossy(mask)), - code: 0, - } + return Err(RuntimeException::new(format!( + "Could not parse netmask {}", + String::from_utf8_lossy(mask) + )) .into()); } if ip.is_empty() { - return Err(RuntimeException { - message: format!("Could not parse target IP {}", String::from_utf8_lossy(ip)), - code: 0, - } + return Err(RuntimeException::new(format!( + "Could not parse target IP {}", + String::from_utf8_lossy(ip) + )) .into()); } @@ -327,23 +324,17 @@ impl NoProxyPattern { // Get the network from the address and mask if netmask.is_empty() { - return Err(RuntimeException { - message: format!( - "Could not parse netmask {}", - String::from_utf8_lossy(&netmask) - ), - code: 0, - } + return Err(RuntimeException::new(format!( + "Could not parse netmask {}", + String::from_utf8_lossy(&netmask) + )) .into()); } if range_ip.is_empty() { - return Err(RuntimeException { - message: format!( - "Could not parse range IP {}", - String::from_utf8_lossy(range_ip) - ), - code: 0, - } + return Err(RuntimeException::new(format!( + "Could not parse range IP {}", + String::from_utf8_lossy(range_ip) + )) .into()); } -- cgit v1.3.1-4-g156e