diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-08 22:14:12 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-08 22:14:12 +0900 |
| commit | f4cad2123b2af0de72bda4ce039e16e74f163f4e (patch) | |
| tree | 21803308c5ff41e23c9d3b117433eea16b4ff663 /crates/shirabe/src/util/perforce.rs | |
| parent | 0209f63210e5b547b5c6b73367bb80ea86c255ec (diff) | |
| download | php-shirabe-f4cad2123b2af0de72bda4ce039e16e74f163f4e.tar.gz php-shirabe-f4cad2123b2af0de72bda4ce039e16e74f163f4e.tar.zst php-shirabe-f4cad2123b2af0de72bda4ce039e16e74f163f4e.zip | |
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::<X>()` 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) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/util/perforce.rs')
| -rw-r--r-- | crates/shirabe/src/util/perforce.rs | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/crates/shirabe/src/util/perforce.rs b/crates/shirabe/src/util/perforce.rs index ac455fc7..d98f1edf 100644 --- a/crates/shirabe/src/util/perforce.rs +++ b/crates/shirabe/src/util/perforce.rs @@ -359,17 +359,13 @@ impl Perforce { if index.is_none() { return Ok(false); } - return Err(Exception { - message: format!("p4 command not found in path: {}", error_output), - code: 0, - } + return Err(Exception::new(format!( + "p4 command not found in path: {}", + error_output + )) .into()); } - return Err(Exception { - message: format!("Invalid user name: {}", user), - code: 0, - } - .into()); + return Err(Exception::new(format!("Invalid user name: {}", user)).into()); } Ok(true) @@ -497,11 +493,7 @@ impl Perforce { let spec = match fopen(&client_spec, "w") { Ok(spec) => spec, Err(e) => { - return Err(Exception { - message: e.to_string(), - code: 0, - } - .into()); + return Err(Exception::new(e.to_string()).into()); } }; let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| { @@ -509,11 +501,7 @@ impl Perforce { })); if let Err(e) = result { fclose(&spec); - return Err(Exception { - message: format!("{:?}", e), - code: 0, - } - .into()); + return Err(Exception::new(format!("{:?}", e)).into()); } fclose(&spec); Ok(()) @@ -565,13 +553,10 @@ impl Perforce { process.run(None, indexmap::IndexMap::new())?; if !process.is_successful() { - return Err(Exception { - message: format!( - "Error logging in:{}", - self.process.borrow().get_error_output() - ), - code: 0, - } + return Err(Exception::new(format!( + "Error logging in:{}", + self.process.borrow().get_error_output() + )) .into()); } } |
