From 0caac63bacefb9a1f62848636d47fca07f592bba Mon Sep 17 00:00:00 2001 From: nsfisis 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) --- crates/shirabe/src/repository/vcs/svn_driver.rs | 55 ++++++------------------- 1 file changed, 12 insertions(+), 43 deletions(-) (limited to 'crates/shirabe/src/repository/vcs/svn_driver.rs') diff --git a/crates/shirabe/src/repository/vcs/svn_driver.rs b/crates/shirabe/src/repository/vcs/svn_driver.rs index bdd7f021..6fb987a4 100644 --- a/crates/shirabe/src/repository/vcs/svn_driver.rs +++ b/crates/shirabe/src/repository/vcs/svn_driver.rs @@ -13,7 +13,7 @@ use crate::util::Svn as SvnUtil; use crate::util::Url; use chrono::{DateTime, FixedOffset, Utc}; use indexmap::IndexMap; -use shirabe_pcre::{CaptureKey, Preg}; +use shirabe_pcre::Preg; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ PhpMixed, RuntimeException, php_regex, stripos, strrpos, strtr, substr, trim, @@ -259,14 +259,9 @@ impl SvnDriver { let (path, rev) = if let Some(m) = Preg::is_match3(php_regex!(r"{^(.+?)(@\d+)?/$}"), &identifier) - && let Some(rev) = m.get(&CaptureKey::ByIndex(2)) + && let Some(rev) = m.get(2) { - ( - m.get(&CaptureKey::ByIndex(1)) - .unwrap_or_default() - .to_string(), - rev.to_string(), - ) + (m.get(1).unwrap_or_default().to_string(), rev.to_string()) } else { (identifier, String::new()) }; @@ -298,14 +293,9 @@ impl SvnDriver { let (path, rev) = if let Some(m) = Preg::is_match3(php_regex!(r"{^(.+?)(@\d+)?/$}"), &identifier) - && let Some(rev) = m.get(&CaptureKey::ByIndex(2)) + && let Some(rev) = m.get(2) { - ( - m.get(&CaptureKey::ByIndex(1)) - .unwrap_or_default() - .to_string(), - rev.to_string(), - ) + (m.get(1).unwrap_or_default().to_string(), rev.to_string()) } else { (identifier, String::new()) }; @@ -319,10 +309,7 @@ impl SvnDriver { && let Some(m) = Preg::is_match3(php_regex!(r"{^Last Changed Date: ([^(]+)}"), &line) { - let date_str = m - .get(&CaptureKey::ByIndex(1)) - .unwrap_or_default() - .to_string(); + let date_str = m.get(1).unwrap_or_default().to_string(); return Ok(shirabe_php_shim::date_create::(date_str.trim()) .ok() .map(|d| d.fixed_offset())); @@ -350,14 +337,8 @@ impl SvnDriver { && let Some(m) = Preg::is_match3(php_regex!(r"{^\s*(\S+).*?(\S+)\s*$}"), &line) { - let rev: i64 = m - .get(&CaptureKey::ByIndex(1)) - .and_then(|s| s.parse().ok()) - .unwrap_or(0); - let path = m - .get(&CaptureKey::ByIndex(2)) - .unwrap_or_default() - .to_string(); + let rev: i64 = m.get(1).and_then(|s| s.parse().ok()).unwrap_or(0); + let path = m.get(2).unwrap_or_default().to_string(); if path == "./" { last_rev = rev; } else { @@ -399,14 +380,8 @@ impl SvnDriver { && let Some(m) = Preg::is_match3(php_regex!(r"{^\s*(\S+).*?(\S+)\s*$}"), &line) { - let rev: i64 = m - .get(&CaptureKey::ByIndex(1)) - .and_then(|s| s.parse().ok()) - .unwrap_or(0); - let path = m - .get(&CaptureKey::ByIndex(2)) - .unwrap_or_default() - .to_string(); + let rev: i64 = m.get(1).and_then(|s| s.parse().ok()).unwrap_or(0); + let path = m.get(2).unwrap_or_default().to_string(); if path == "./" { let identifier = self.build_identifier( &format!("/{}", self.trunk_path.clone().unwrap_or_default()), @@ -440,14 +415,8 @@ impl SvnDriver { && let Some(m) = Preg::is_match3(php_regex!(r"{^\s*(\S+).*?(\S+)\s*$}"), &line) { - let rev: i64 = m - .get(&CaptureKey::ByIndex(1)) - .and_then(|s| s.parse().ok()) - .unwrap_or(0); - let path = m - .get(&CaptureKey::ByIndex(2)) - .unwrap_or_default() - .to_string(); + let rev: i64 = m.get(1).and_then(|s| s.parse().ok()).unwrap_or(0); + let path = m.get(2).unwrap_or_default().to_string(); if path == "./" { last_rev = rev; } else { -- cgit v1.3.1-4-g156e