From 716f44031a39c5e43fb441ecc470db76efc23dd4 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 14 Jun 2026 11:24:36 +0900 Subject: 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 --- crates/shirabe/src/platform/version.rs | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'crates/shirabe/src/platform') 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 = IndexMap::new(); - if !Preg::match3(r"^(?P[0-9.]+)(?P[a-z]{0,2})(?P(?:-?(?:dev|pre|alpha|beta|rc|fips)[\d]*)*)(?:-\w+)?(?: \(.+?\))?$", - openssl_version, - Some(&mut matches),) - .unwrap_or(false) - { + if !Preg::match3( + r"^(?P[0-9.]+)(?P[a-z]{0,2})(?P(?:-?(?:dev|pre|alpha|beta|rc|fips)[\d]*)*)(?:-\w+)?(?: \(.+?\))?$", + openssl_version, + Some(&mut matches), + ) { return None; } @@ -59,9 +59,7 @@ impl Version { r"^(?P\d+)(?P[a-z]*)$", libjpeg_version, Some(&mut matches), - ) - .unwrap_or(false) - { + ) { return None; } @@ -86,9 +84,7 @@ impl Version { r"^(?P\d{4})(?P[a-z]*)$", zoneinfo_version, Some(&mut matches), - ) - .unwrap_or(false) - { + ) { return None; } -- cgit v1.3.1