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/repository/composer_repository.rs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'crates/shirabe/src/repository/composer_repository.rs') diff --git a/crates/shirabe/src/repository/composer_repository.rs b/crates/shirabe/src/repository/composer_repository.rs index 6feb4359..d42a9778 100644 --- a/crates/shirabe/src/repository/composer_repository.rs +++ b/crates/shirabe/src/repository/composer_repository.rs @@ -251,8 +251,8 @@ impl ComposerRepository { ) { let proto = match_packagist .get(&CaptureKey::ByName("proto".to_string())) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); url = format!("{}://repo.packagist.org", proto); } @@ -786,12 +786,12 @@ impl ComposerRepository { { let q = match_groups .get(&CaptureKey::ByName("query".to_string())) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); let vendor = match_groups .get(&CaptureKey::ByName("vendor".to_string())) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); let url = format!( "{}?vendor={}&filter={}", list_url, @@ -2429,10 +2429,7 @@ impl ComposerRepository { if let Some(matches) = Preg::is_match3(php_regex!(r"{^[^:]++://[^/]*+}"), &self.url) { return Ok(format!( "{}{}", - matches - .get(&CaptureKey::ByIndex(0)) - .cloned() - .unwrap_or_default(), + matches.get(&CaptureKey::ByIndex(0)).unwrap_or_default(), url )); } -- cgit v1.3.1-4-g156e