diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-06-14 11:24:36 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-06-14 11:28:19 +0900 |
| commit | 716f44031a39c5e43fb441ecc470db76efc23dd4 (patch) | |
| tree | e6f4a31e4bf55a0a8efb06d9dd4844c567e7390f /crates/shirabe/src/platform/version.rs | |
| parent | ef9118c788c1cbb22ca7721b6a9e40c2bf2fe243 (diff) | |
| download | php-shirabe-716f44031a39c5e43fb441ecc470db76efc23dd4.tar.gz php-shirabe-716f44031a39c5e43fb441ecc470db76efc23dd4.tar.zst php-shirabe-716f44031a39c5e43fb441ecc470db76efc23dd4.zip | |
refactor(pcre): drop Result from Preg method return types
The Preg methods panic on PCRE failure (per the file header rationale),
so their anyhow::Result wrappers never carried an Err.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/platform/version.rs')
| -rw-r--r-- | crates/shirabe/src/platform/version.rs | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/crates/shirabe/src/platform/version.rs b/crates/shirabe/src/platform/version.rs index f1d2b87..b78baad 100644 --- a/crates/shirabe/src/platform/version.rs +++ b/crates/shirabe/src/platform/version.rs @@ -11,11 +11,11 @@ impl Version { *is_fips = false; let mut matches: IndexMap<CaptureKey, String> = IndexMap::new(); - if !Preg::match3(r"^(?P<version>[0-9.]+)(?P<patch>[a-z]{0,2})(?P<suffix>(?:-?(?:dev|pre|alpha|beta|rc|fips)[\d]*)*)(?:-\w+)?(?: \(.+?\))?$", - openssl_version, - Some(&mut matches),) - .unwrap_or(false) - { + if !Preg::match3( + r"^(?P<version>[0-9.]+)(?P<patch>[a-z]{0,2})(?P<suffix>(?:-?(?:dev|pre|alpha|beta|rc|fips)[\d]*)*)(?:-\w+)?(?: \(.+?\))?$", + openssl_version, + Some(&mut matches), + ) { return None; } @@ -59,9 +59,7 @@ impl Version { r"^(?P<major>\d+)(?P<minor>[a-z]*)$", libjpeg_version, Some(&mut matches), - ) - .unwrap_or(false) - { + ) { return None; } @@ -86,9 +84,7 @@ impl Version { r"^(?P<year>\d{4})(?P<revision>[a-z]*)$", zoneinfo_version, Some(&mut matches), - ) - .unwrap_or(false) - { + ) { return None; } |
