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/url.rs | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'crates/shirabe/src/util/url.rs') diff --git a/crates/shirabe/src/util/url.rs b/crates/shirabe/src/util/url.rs index 0a3722eb..8b751b2a 100644 --- a/crates/shirabe/src/util/url.rs +++ b/crates/shirabe/src/util/url.rs @@ -22,9 +22,9 @@ impl Url { ) { url = format!( "https://api.github.com/repos/{}/{}/{}ball/{}", - m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(), - m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(), - m.get(&CaptureKey::ByIndex(3)).cloned().unwrap_or_default(), + m.get(&CaptureKey::ByIndex(1)).unwrap_or_default(), + m.get(&CaptureKey::ByIndex(2)).unwrap_or_default(), + m.get(&CaptureKey::ByIndex(3)).unwrap_or_default(), r#ref ); } else if let Some(m) = Preg::match3( @@ -35,9 +35,9 @@ impl Url { ) { url = format!( "https://api.github.com/repos/{}/{}/{}ball/{}", - m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(), - m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(), - m.get(&CaptureKey::ByIndex(3)).cloned().unwrap_or_default(), + m.get(&CaptureKey::ByIndex(1)).unwrap_or_default(), + m.get(&CaptureKey::ByIndex(2)).unwrap_or_default(), + m.get(&CaptureKey::ByIndex(3)).unwrap_or_default(), r#ref ); } else if let Some(m) = Preg::match3( @@ -48,9 +48,9 @@ impl Url { ) { url = format!( "https://api.github.com/repos/{}/{}/{}ball/{}", - m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(), - m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(), - m.get(&CaptureKey::ByIndex(3)).cloned().unwrap_or_default(), + m.get(&CaptureKey::ByIndex(1)).unwrap_or_default(), + m.get(&CaptureKey::ByIndex(2)).unwrap_or_default(), + m.get(&CaptureKey::ByIndex(3)).unwrap_or_default(), r#ref ); } @@ -63,10 +63,10 @@ impl Url { ) { url = format!( "https://bitbucket.org/{}/{}/get/{}.{}", - m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(), - m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(), + m.get(&CaptureKey::ByIndex(1)).unwrap_or_default(), + m.get(&CaptureKey::ByIndex(2)).unwrap_or_default(), r#ref, - m.get(&CaptureKey::ByIndex(4)).cloned().unwrap_or_default() + m.get(&CaptureKey::ByIndex(4)).unwrap_or_default() ); } } else if host == "gitlab.com" || host == "www.gitlab.com" { @@ -78,8 +78,8 @@ impl Url { ) { url = format!( "https://gitlab.com/api/v4/projects/{}/repository/archive.{}?sha={}", - m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(), - m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(), + m.get(&CaptureKey::ByIndex(1)).unwrap_or_default(), + m.get(&CaptureKey::ByIndex(2)).unwrap_or_default(), r#ref ); } @@ -165,12 +165,12 @@ impl Url { |m| { let user = m .get(&CaptureKey::ByName("user".to_string())) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); let prefix = m .get(&CaptureKey::ByName("prefix".to_string())) - .cloned() - .unwrap_or_default(); + .unwrap_or_default() + .to_string(); // if the username looks like a long (12char+) hex string, or a modern github token (e.g. ghp_xxx, github_pat_xxx) we obfuscate that if Preg::is_match(GitHub::GITHUB_TOKEN_REGEX, &user) { format!("{}***:***@", prefix) -- cgit v1.3.1-4-g156e