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/tests/all_functional_test.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/shirabe/tests/all_functional_test.rs') diff --git a/crates/shirabe/tests/all_functional_test.rs b/crates/shirabe/tests/all_functional_test.rs index 8578ed43..ad075ad6 100644 --- a/crates/shirabe/tests/all_functional_test.rs +++ b/crates/shirabe/tests/all_functional_test.rs @@ -144,11 +144,11 @@ fn expect_matches(expected: &str, output: &str) { let Some(m) = Preg::is_match3(php_regex!("{%(.+?)%}"), &expected[i..]) else { panic!("Failed to match %...% in {}", &expected[i..]); }; - let regex = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap(); + let regex = m.get(&CaptureKey::ByIndex(1)).map(str::to_string).unwrap(); let pattern = format!("{{{}}}", regex); if let Some(m) = Preg::is_match3(&pattern, &output[j..]) { - let full = m.get(&CaptureKey::ByIndex(0)).cloned().unwrap(); + let full = m.get(&CaptureKey::ByIndex(0)).map(str::to_string).unwrap(); i += regex.len() + 2; j += full.len(); continue; -- cgit v1.3.1-4-g156e