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) --- .../shirabe/src/package/version/version_guesser.rs | 29 ++++++---------------- 1 file changed, 8 insertions(+), 21 deletions(-) (limited to 'crates/shirabe/src/package/version/version_guesser.rs') diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs index a01bf469..c85000e7 100644 --- a/crates/shirabe/src/package/version/version_guesser.rs +++ b/crates/shirabe/src/package/version/version_guesser.rs @@ -12,7 +12,7 @@ use crate::util::ProcessExecutor; use crate::util::Svn as SvnUtil; use crate::util::sync_executor; use indexmap::IndexMap; -use shirabe_pcre::{CaptureKey, Preg}; +use shirabe_pcre::Preg; use shirabe_php_shim::{ PhpMixed, RuntimeException, array_keys, array_map, array_merge, empty, function_exists, implode, is_string, json_encode, php_regex, preg_quote, str_replace, strlen, strnatcasecmp, @@ -236,14 +236,8 @@ impl VersionGuesser { &branch, ) { - let g1 = m - .get(&CaptureKey::ByIndex(1)) - .unwrap_or_default() - .to_string(); - let g2 = m - .get(&CaptureKey::ByIndex(2)) - .unwrap_or_default() - .to_string(); + let g1 = m.get(1).unwrap_or_default().to_string(); + let g2 = m.get(2).unwrap_or_default().to_string(); if g1 == "(no branch)" || strpos(&g1, "(detached ") == Some(0) || strpos(&g1, "(HEAD detached at") == Some(0) @@ -270,11 +264,7 @@ impl VersionGuesser { &branch, ) { - branches.push( - m.get(&CaptureKey::ByIndex(1)) - .unwrap_or_default() - .to_string(), - ); + branches.push(m.get(1).unwrap_or_default().to_string()); } } @@ -708,9 +698,9 @@ impl VersionGuesser { ); if let Some(matches) = Preg::is_match3(&url_pattern, &output) { - let m1 = matches.get(&CaptureKey::ByIndex(1)).unwrap_or_default(); - let m2 = matches.get(&CaptureKey::ByIndex(2)); - let m3 = matches.get(&CaptureKey::ByIndex(3)); + let m1 = matches.get(1).unwrap_or_default(); + let m2 = matches.get(2); + let m3 = matches.get(3); if let Some(m2) = m2 && let Some(m3) = m3 && (branches_path == *m2 || tags_path == *m2) @@ -761,10 +751,7 @@ impl VersionGuesser { } }; if let Some(m) = Preg::is_match3(php_regex!(r"{^(\d+(?:\.\d+)*)-dev$}i"), &version) { - return Ok(format!( - "{}.x-dev", - m.get(&CaptureKey::ByIndex(1)).unwrap_or_default() - )); + return Ok(format!("{}.x-dev", m.get(1).unwrap_or_default())); } Ok(version) -- cgit v1.3.1-4-g156e