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/hg.rs | 50 ++++++++++++++-----------------------------
 1 file changed, 16 insertions(+), 34 deletions(-)

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

diff --git a/crates/shirabe/src/util/hg.rs b/crates/shirabe/src/util/hg.rs
index 395ea6d5..f95f15d5 100644
--- a/crates/shirabe/src/util/hg.rs
+++ b/crates/shirabe/src/util/hg.rs
@@ -5,7 +5,7 @@ use crate::io::IOInterface;
 use crate::io::IOInterfaceImmutable;
 use crate::util::ProcessExecutor;
 use crate::util::Url;
-use shirabe_pcre::{CaptureKey, Preg};
+use shirabe_pcre::Preg;
 use shirabe_php_shim::{php_regex, rawurlencode};
 use std::sync::OnceLock;
 
@@ -64,44 +64,30 @@ impl Hg {
         );
 
         if let Some(matches) = matched
-            && self.io.has_authentication(
-                matches
-                    .get(&CaptureKey::ByName("host".to_string()))
-                    .unwrap_or(""),
-            )
+            && self
+                .io
+                .has_authentication(matches.name("host").unwrap_or(""))
         {
-            let authenticated_url = if matches.get(&CaptureKey::ByName("proto".to_string()))
-                == Some("ssh")
-            {
-                let user = if let Some(u) = matches.get(&CaptureKey::ByName("user".to_string())) {
+            let authenticated_url = if matches.name("proto") == Some("ssh") {
+                let user = if let Some(u) = matches.name("user") {
                     format!("{}@", rawurlencode(u))
                 } else {
                     String::new()
                 };
                 format!(
                     "{}://{}{}{}",
-                    matches
-                        .get(&CaptureKey::ByName("proto".to_string()))
-                        .unwrap_or(""),
+                    matches.name("proto").unwrap_or(""),
                     user,
-                    matches
-                        .get(&CaptureKey::ByName("host".to_string()))
-                        .unwrap_or(""),
-                    matches
-                        .get(&CaptureKey::ByName("path".to_string()))
-                        .unwrap_or(""),
+                    matches.name("host").unwrap_or(""),
+                    matches.name("path").unwrap_or(""),
                 )
             } else {
-                let auth = self.io.get_authentication(
-                    matches
-                        .get(&CaptureKey::ByName("host".to_string()))
-                        .unwrap_or(""),
-                );
+                let auth = self
+                    .io
+                    .get_authentication(matches.name("host").unwrap_or(""));
                 format!(
                     "{}://{}:{}@{}{}",
-                    matches
-                        .get(&CaptureKey::ByName("proto".to_string()))
-                        .unwrap_or(""),
+                    matches.name("proto").unwrap_or(""),
                     rawurlencode(
                         auth.get("username")
                             .and_then(|s| s.as_deref())
@@ -112,12 +98,8 @@ impl Hg {
                             .and_then(|s| s.as_deref())
                             .unwrap_or("")
                     ),
-                    matches
-                        .get(&CaptureKey::ByName("host".to_string()))
-                        .unwrap_or(""),
-                    matches
-                        .get(&CaptureKey::ByName("path".to_string()))
-                        .unwrap_or(""),
+                    matches.name("host").unwrap_or(""),
+                    matches.name("path").unwrap_or(""),
                 )
             };
 
@@ -174,7 +156,7 @@ impl Hg {
                         &output,
                     )
                 {
-                    return matches.get(&CaptureKey::ByIndex(1)).map(str::to_string);
+                    return matches.get(1).map(str::to_string);
                 }
                 None
             })
-- 
cgit v1.3.1-4-g156e