From 530d085d4f3e19f94ac3cf8f8ac3b17000214b2e Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 18 Aug 2026 01:57:02 +0900 Subject: refactor(pcre): inline Preg into its call sites and drop the crate Preg had shed everything it owned: after the last few rounds its methods were one-line forwards to the shim's preg_*(), differing only in a default argument or a wrapper the caller unwrapped anyway. The 460 call sites now name the shim function, and shirabe-pcre is gone from the workspace along with its LICENSE entry. The forwards expand as they read: isMatch becomes preg_match2(.., 0).is_some() (is_none() where PHP negates it), isMatch3 and match3 drop the .is_some(), matchAll counts through preg_match_all2(..).occurrence_count(), and replace4/replace5 spell out the limit and count arguments preg_replace2 takes. Callbacks are the one place the shapes differ: preg_replace_callback carries an error out of the callback, so the fourteen infallible closures wrap their result in Ok() and expect() it back. Config::process() is the fifteenth, and it drops the `error` cell it captured to smuggle a failure past a closure that could only return a String. The `?` in the closure now carries it, which is what the PHP does -- a throw from the callback leaves preg_replace_callback at the failing match rather than running the remaining replacements and reporting the last error. The module doc that explained why composer/pcre's exceptions and *StrictGroups() variants have no counterpart moves to the shim's preg module, where the functions it describes live. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/src/platform/version.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'crates/shirabe/src/platform') diff --git a/crates/shirabe/src/platform/version.rs b/crates/shirabe/src/platform/version.rs index 00ff3097..baa029ef 100644 --- a/crates/shirabe/src/platform/version.rs +++ b/crates/shirabe/src/platform/version.rs @@ -1,7 +1,6 @@ //! ref: composer/src/Composer/Platform/Version.php -use shirabe_pcre::Preg; -use shirabe_php_shim::{CmpOp, php_regex, version_compare}; +use shirabe_php_shim::{CmpOp, php_regex, preg_match2, version_compare}; pub struct Version; @@ -9,11 +8,12 @@ impl Version { pub fn parse_openssl(openssl_version: &str, is_fips: &mut bool) -> Option { *is_fips = false; - let matches = Preg::match3( + let matches = preg_match2( php_regex!( r"/^(?P[0-9.]+)(?P[a-z]{0,2})(?P(?:-?(?:dev|pre|alpha|beta|rc|fips)[\d]*)*)(?:-\w+)?(?: \(.+?\))?$/" ), openssl_version, + 0, )?; let version = matches.name("version").unwrap_or_default().to_string(); @@ -42,9 +42,10 @@ impl Version { } pub fn parse_libjpeg(libjpeg_version: &str) -> Option { - let matches = Preg::match3( + let matches = preg_match2( php_regex!(r"/^(?P\d+)(?P[a-z]*)$/"), libjpeg_version, + 0, )?; let major = matches.name("major").unwrap_or_default().to_string(); @@ -57,9 +58,10 @@ impl Version { } pub fn parse_zoneinfo_version(zoneinfo_version: &str) -> Option { - let matches = Preg::match3( + let matches = preg_match2( php_regex!(r"/^(?P\d{4})(?P[a-z]*)$/"), zoneinfo_version, + 0, )?; let year = matches.name("year").unwrap_or_default().to_string(); -- cgit v1.3.1-4-g156e