From 844097edf44bf1424d28e2d5fbefda90c1c8f46c Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 18 Aug 2026 01:57:02 +0900 Subject: refactor(pcre): hand back the match instead of copying it out Preg::match4 and Preg::replace_callback gave callers a PregMatchedGroups: an IndexMap rebuilt from the match with an owned String per group, plus a second String for a named group's name key. That is the copy PregMatches shed when it started wrapping regex::Captures, reinstated one layer up -- and nearly every regex call in the tree goes through Preg rather than the shim's preg_* directly, so almost nothing saw the borrow. PregMatchedGroups existed only to drop the null (unmatched) groups the old PregMatches held as Option values. PregMatches::get reports a non-participating group as None on its own, so the two read alike and the type collapses into it. Call sites still reach groups through get(&CaptureKey::ByIndex(N)); what changes is that the value arrives as a &str borrowed from the subject, which the signatures now carry as a lifetime. Three places needed the borrow reckoned with rather than a mechanical rewrite: PhpFileCleaner::clean and Problem::get_messages read their groups out before mutating what the match borrows, and Git::get_authentication_failure names the lifetime of its url argument, which the result borrows instead of self. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/src/config.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'crates/shirabe/src/config.rs') diff --git a/crates/shirabe/src/config.rs b/crates/shirabe/src/config.rs index 796e23fc..dd86149c 100644 --- a/crates/shirabe/src/config.rs +++ b/crates/shirabe/src/config.rs @@ -8,7 +8,7 @@ pub use json_config_source::*; use crate::io::io_interface; use indexmap::IndexMap; -use shirabe_pcre::{CaptureKey, Preg, PregMatchedGroups}; +use shirabe_pcre::{CaptureKey, Preg, PregMatches}; use shirabe_php_shim::{ E_USER_DEPRECATED, PhpMixed, RuntimeException, array_key_exists, array_merge, array_search_mixed, array_unique, empty, filter_var_url, implode, in_array_loose, @@ -659,11 +659,11 @@ impl Config { }; let mut size = matches .get(&CaptureKey::ByIndex(1)) - .cloned() .unwrap_or_default() + .to_string() .parse::() .unwrap_or(0.0); - let unit = matches.get(&CaptureKey::ByIndex(2)).cloned(); + let unit = matches.get(&CaptureKey::ByIndex(2)).map(str::to_string); if let Some(unit) = unit { match strtolower(&unit).as_str() { "g" => { @@ -959,8 +959,11 @@ impl Config { let mut error = None; let result = Preg::replace_callback( php_regex!(r"#\{\$(.+)\}#"), - |m: &PregMatchedGroups| -> String { - let key_match = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(); + |m: &PregMatches| -> String { + let key_match = m + .get(&CaptureKey::ByIndex(1)) + .unwrap_or_default() + .to_string(); match self.get_with_flags(&key_match, flags) { Ok(v) => php_to_string(&v), Err(e) => { -- cgit v1.3.1-4-g156e