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.toml | 1 - 1 file changed, 1 deletion(-) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index e0e8b892..574e800a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,6 @@ shirabe = { path = "crates/shirabe" } shirabe-ca-bundle = { path = "crates/shirabe-ca-bundle" } shirabe-class-map-generator = { path = "crates/shirabe-class-map-generator" } shirabe-metadata-minifier = { path = "crates/shirabe-metadata-minifier" } -shirabe-pcre = { path = "crates/shirabe-pcre" } shirabe-php-rpc = { path = "crates/shirabe-php-rpc" } shirabe-php-shim = { path = "crates/shirabe-php-shim" } shirabe-php-src = { path = "crates/shirabe-php-src" } -- cgit v1.3.1-4-g156e