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/command/package_discovery_trait.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'crates/shirabe/src/command/package_discovery_trait.rs') diff --git a/crates/shirabe/src/command/package_discovery_trait.rs b/crates/shirabe/src/command/package_discovery_trait.rs index 4745a7d5..5b53bcbd 100644 --- a/crates/shirabe/src/command/package_discovery_trait.rs +++ b/crates/shirabe/src/command/package_discovery_trait.rs @@ -334,8 +334,9 @@ pub trait PackageDiscoveryTrait: BaseCommand { php_regex!(r"{^\s*(?P[\S/]+)(?:\s+(?P\S+))?\s*$}"), &selection, ) { - if let Some(v) = - m.get(&CaptureKey::ByName("version".to_string())).cloned() + if let Some(v) = m + .get(&CaptureKey::ByName("version".to_string())) + .map(str::to_string) { // parsing `acme/example ~2.3` // validate version constraint @@ -344,7 +345,6 @@ pub trait PackageDiscoveryTrait: BaseCommand { return Ok(PhpMixed::String(format!( "{} {}", m.get(&CaptureKey::ByName("name".to_string())) - .cloned() .unwrap_or_default(), v, ))); @@ -353,8 +353,8 @@ pub trait PackageDiscoveryTrait: BaseCommand { // parsing `acme/example` return Ok(PhpMixed::String( m.get(&CaptureKey::ByName("name".to_string())) - .cloned() - .unwrap_or_default(), + .unwrap_or_default() + .to_string(), )); } -- cgit v1.3.1-4-g156e