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) --- Cargo.lock | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index 324f0896..62a5eb94 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2106,7 +2106,6 @@ dependencies = [ "shirabe-ca-bundle", "shirabe-class-map-generator", "shirabe-metadata-minifier", - "shirabe-pcre", "shirabe-php-rpc", "shirabe-php-shim", "shirabe-seld-json-lint", @@ -2136,7 +2135,6 @@ version = "0.0.1" dependencies = [ "anyhow", "indexmap", - "shirabe-pcre", "shirabe-php-rpc", "shirabe-php-shim", "shirabe-symfony-finder", @@ -2150,15 +2148,6 @@ dependencies = [ "shirabe-php-shim", ] -[[package]] -name = "shirabe-pcre" -version = "0.0.1" -dependencies = [ - "indexmap", - "regex", - "shirabe-php-shim", -] - [[package]] name = "shirabe-php-rpc" version = "0.0.1" @@ -2239,7 +2228,6 @@ dependencies = [ "anyhow", "indexmap", "regex", - "shirabe-pcre", "shirabe-php-shim", "shirabe-symfony-process", "shirabe-symfony-string", @@ -2262,7 +2250,6 @@ dependencies = [ "chrono", "indexmap", "regex", - "shirabe-pcre", "shirabe-php-shim", ] -- cgit v1.3.1-4-g156e