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/downloader/git_downloader.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'crates/shirabe/src/downloader/git_downloader.rs') diff --git a/crates/shirabe/src/downloader/git_downloader.rs b/crates/shirabe/src/downloader/git_downloader.rs index d3f4441a..83f72300 100644 --- a/crates/shirabe/src/downloader/git_downloader.rs +++ b/crates/shirabe/src/downloader/git_downloader.rs @@ -101,8 +101,8 @@ impl GitDownloader { }; let head_ref = head_match .get(&CaptureKey::ByIndex(1)) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); let branches_match = Preg::is_match_all( format!("{{^{} refs/heads/(.+)$}}mi", preg_quote(&head_ref, None)), @@ -513,16 +513,16 @@ impl GitDownloader { let protocols = self.inner.config.borrow_mut().get("github-protocols"); let m1 = match_ .get(&CaptureKey::ByIndex(1)) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); let m2 = match_ .get(&CaptureKey::ByIndex(2)) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); let m3 = match_ .get(&CaptureKey::ByIndex(3)) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); let mut push_url = format!("git@{}:{}/{}.git", m1, m2, m3); if !in_array_strict("ssh".to_string(), protocols.values()) { push_url = format!("https://{}/{}/{}.git", m1, m2, m3); @@ -1112,12 +1112,12 @@ impl VcsDownloader for GitDownloader { { let origin_url = origin_match .get(&CaptureKey::ByName("url".to_string())) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); let composer_url = composer_match .get(&CaptureKey::ByName("url".to_string())) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); if origin_url == composer_url && Some(composer_url.as_str()) != target.get_source_url().as_deref() { -- cgit v1.3.1-4-g156e