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/util/composer_mirror.rs | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'crates/shirabe/src/util/composer_mirror.rs') diff --git a/crates/shirabe/src/util/composer_mirror.rs b/crates/shirabe/src/util/composer_mirror.rs index 7344bfaf..5d9e8c31 100644 --- a/crates/shirabe/src/util/composer_mirror.rs +++ b/crates/shirabe/src/util/composer_mirror.rs @@ -61,14 +61,8 @@ impl ComposerMirror { ) { format!( "gh-{}/{}", - gh_matches - .get(&CaptureKey::ByIndex(1)) - .cloned() - .unwrap_or_default(), - gh_matches - .get(&CaptureKey::ByIndex(2)) - .cloned() - .unwrap_or_default(), + gh_matches.get(&CaptureKey::ByIndex(1)).unwrap_or_default(), + gh_matches.get(&CaptureKey::ByIndex(2)).unwrap_or_default(), ) } else if let Some(bb_matches) = Preg::match3( php_regex!(r"#^https://bitbucket\.org/([^/]+)/(.+?)(?:\.git)?/?$#"), @@ -76,14 +70,8 @@ impl ComposerMirror { ) { format!( "bb-{}/{}", - bb_matches - .get(&CaptureKey::ByIndex(1)) - .cloned() - .unwrap_or_default(), - bb_matches - .get(&CaptureKey::ByIndex(2)) - .cloned() - .unwrap_or_default(), + bb_matches.get(&CaptureKey::ByIndex(1)).unwrap_or_default(), + bb_matches.get(&CaptureKey::ByIndex(2)).unwrap_or_default(), ) } else { Preg::replace(php_regex!(r"{[^a-z0-9_.-]}i"), "-", url.trim_matches('/')) -- cgit v1.3.1-4-g156e