From 844097edf44bf1424d28e2d5fbefda90c1c8f46c Mon Sep 17 00:00:00 2001
From: nsfisis <nsfisis@gmail.com>
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<String> 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) <noreply@anthropic.com>
---
 crates/shirabe-symfony-finder/src/finder.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'crates/shirabe-symfony-finder')

diff --git a/crates/shirabe-symfony-finder/src/finder.rs b/crates/shirabe-symfony-finder/src/finder.rs
index cc78ebe3..d3c76e3f 100644
--- a/crates/shirabe-symfony-finder/src/finder.rs
+++ b/crates/shirabe-symfony-finder/src/finder.rs
@@ -9,7 +9,7 @@
 use crate::glob::Glob;
 use chrono::{NaiveDate, NaiveDateTime};
 use indexmap::IndexSet;
-use shirabe_pcre::{CaptureKey, Preg, PregMatchedGroups};
+use shirabe_pcre::{CaptureKey, Preg};
 use shirabe_php_shim::{file_exists, glob, is_dir, php_regex, preg_quote, rtrim};
 use std::path::{Path, PathBuf};
 use std::time::UNIX_EPOCH;
@@ -642,13 +642,12 @@ fn is_regex(str: &str) -> bool {
     // PHP 8.2+ available modifiers.
     let available_modifiers = "imsxuADUn";
 
-    let matches = PregMatchedGroups::new();
     let pattern = format!("/^(.{{3,}}?)[{available_modifiers}]*$/");
     if let Some(matches) = Preg::is_match3(&pattern, str) {
         let group = matches
             .get(&CaptureKey::ByIndex(1))
-            .cloned()
-            .unwrap_or_default();
+            .unwrap_or_default()
+            .to_string();
         let bytes = group.as_bytes();
         let start = bytes
             .first()
@@ -694,13 +693,13 @@ fn parse_date_comparator(test: &str) -> (String, i64) {
 
     let date = matches
         .get(&CaptureKey::ByIndex(2))
-        .cloned()
-        .unwrap_or_default();
+        .unwrap_or_default()
+        .to_string();
     let target = parse_datetime_to_unix(&date);
 
     let mut operator = matches
         .get(&CaptureKey::ByIndex(1))
-        .cloned()
+        .map(str::to_string)
         .unwrap_or_else(|| "==".to_string());
     if operator == "since" || operator == "after" {
         operator = ">".to_string();
-- 
cgit v1.3.1-4-g156e