From 0caac63bacefb9a1f62848636d47fca07f592bba Mon Sep 17 00:00:00 2001
From: nsfisis <nsfisis@gmail.com>
Date: Tue, 18 Aug 2026 01:57:02 +0900
Subject: refactor(preg): split PregMatches reads into get() and name()

PregMatches keyed both forms of a capture group through CaptureKey, so
every read built one: a usize wrapped in an enum, or worse, a String
allocated to name a group that regex::Captures can look up from a &str.
It now mirrors regex::Captures instead -- get() takes the group number,
name() the group name -- and the enum drops out of the type entirely.

That is 285 call sites across 59 files, and the named ones carry most of
the win: `matches.get(&CaptureKey::ByName("host".to_string()))` reads as
`matches.name("host")`. ProcessExecutor loses a `user_key` binding that
existed only to build the key once.

CaptureKey stays as the key type of PregMatchesAll and
PregMatchesAllWithOffsets, where numbered and named entries share one
IndexMap and a key type is the point. Five files still name it.

Also retargets the two preg_match_all comments that described the
occurrence count through `matches[&CaptureKey::ByIndex(0)].len()`, an
Index impl these types no longer carry.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 crates/shirabe/src/util/process_executor.rs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'crates/shirabe/src/util/process_executor.rs')

diff --git a/crates/shirabe/src/util/process_executor.rs b/crates/shirabe/src/util/process_executor.rs
index 2954ed7a..2bfaeb94 100644
--- a/crates/shirabe/src/util/process_executor.rs
+++ b/crates/shirabe/src/util/process_executor.rs
@@ -7,7 +7,7 @@ use crate::signal::SignalSubscription;
 use crate::util::GitHub;
 use crate::util::Platform;
 use indexmap::IndexMap;
-use shirabe_pcre::{CaptureKey, Preg, PregMatches};
+use shirabe_pcre::{Preg, PregMatches};
 use shirabe_php_shim::Catch as _;
 use shirabe_php_shim::{
     LogicException, PHP_EOL, PhpMixed, RuntimeException, array_intersect, array_map,
@@ -219,10 +219,7 @@ impl ProcessExecutor {
             if Platform::is_windows()
                 && let Some(m) = Preg::is_match3(php_regex!(r"{^([^:/\\]++) }"), &command_str)
             {
-                let m1 = m
-                    .get(&CaptureKey::ByIndex(1))
-                    .unwrap_or_default()
-                    .to_string();
+                let m1 = m.get(1).unwrap_or_default().to_string();
                 command_str = substr_replace(
                     &command_str,
                     &Self::escape(&Self::get_executable(&m1)),
@@ -835,19 +832,18 @@ impl ProcessExecutor {
         let safe_command = Preg::replace_callback(
             php_regex!(r"{://(?P<user>[^:/\s]+):(?P<password>[^@\s/]+)@}i"),
             |m: &PregMatches| -> String {
-                let user_key = CaptureKey::ByName("user".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,
-                    m.get(&user_key).unwrap_or_default(),
+                    m.name("user").unwrap_or_default(),
                 ) {
                     return "://***:***@".to_string();
                 }
-                if Preg::is_match(r"{^[a-f0-9]{12,}$}", m.get(&user_key).unwrap_or_default()) {
+                if Preg::is_match(r"{^[a-f0-9]{12,}$}", m.name("user").unwrap_or_default()) {
                     return "://***:***@".to_string();
                 }
 
-                format!("://{}:***@", m.get(&user_key).unwrap_or_default())
+                format!("://{}:***@", m.name("user").unwrap_or_default())
             },
             &command_string,
         );
-- 
cgit v1.3.1-4-g156e