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/repository/array_repository.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'crates/shirabe/src/repository/array_repository.rs') diff --git a/crates/shirabe/src/repository/array_repository.rs b/crates/shirabe/src/repository/array_repository.rs index 0f3dc237..2e364d0e 100644 --- a/crates/shirabe/src/repository/array_repository.rs +++ b/crates/shirabe/src/repository/array_repository.rs @@ -12,8 +12,7 @@ use crate::repository::{ RepositoryInterfaceHandle, RepositoryInterfaceWeakHandle, SearchResult, }; use indexmap::IndexMap; -use shirabe_pcre::Preg; -use shirabe_php_shim::{implode, php_regex, preg_quote, preg_split, strtolower}; +use shirabe_php_shim::{implode, php_regex, preg_match2, preg_quote, preg_split, strtolower}; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::SimpleConstraint; use std::rc::Weak; @@ -358,7 +357,7 @@ impl RepositoryInterface for ArrayRepository { let fulltext_match = mode == crate::repository::SEARCH_FULLTEXT && complete.is_some() - && Preg::is_match( + && preg_match2( ®ex, &format!( "{} {}", @@ -369,9 +368,11 @@ impl RepositoryInterface for ArrayRepository { .get_description() .unwrap_or_default() ), - ); + 0, + ) + .is_some(); - if Preg::is_match(®ex, &name) || fulltext_match { + if preg_match2(®ex, &name, 0).is_some() || fulltext_match { if mode == crate::repository::SEARCH_VENDOR { matches.insert( name.clone(), -- cgit v1.3.1-4-g156e