diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-18 01:57:02 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-18 01:57:02 +0900 |
| commit | 0caac63bacefb9a1f62848636d47fca07f592bba (patch) | |
| tree | 8d2ef66e597a8d8c228d3ba2490a59f48b26db4d /crates/shirabe/src/package | |
| parent | 34c74255d781ad0a0bf7cc5ad4ec1761bef61e04 (diff) | |
| download | php-shirabe-0caac63bacefb9a1f62848636d47fca07f592bba.tar.gz php-shirabe-0caac63bacefb9a1f62848636d47fca07f592bba.tar.zst php-shirabe-0caac63bacefb9a1f62848636d47fca07f592bba.zip | |
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>
Diffstat (limited to 'crates/shirabe/src/package')
| -rw-r--r-- | crates/shirabe/src/package/loader/root_package_loader.rs | 24 | ||||
| -rw-r--r-- | crates/shirabe/src/package/locker.rs | 4 | ||||
| -rw-r--r-- | crates/shirabe/src/package/package.rs | 6 | ||||
| -rw-r--r-- | crates/shirabe/src/package/version/version_guesser.rs | 29 |
4 files changed, 16 insertions, 47 deletions
diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs index 1d068ad6..012c30fd 100644 --- a/crates/shirabe/src/package/loader/root_package_loader.rs +++ b/crates/shirabe/src/package/loader/root_package_loader.rs @@ -15,7 +15,7 @@ use crate::repository::RepositoryManager; use crate::util::Platform; use crate::util::ProcessExecutor; use indexmap::IndexMap; -use shirabe_pcre::{CaptureKey, Preg}; +use shirabe_pcre::Preg; use shirabe_php_shim::{ PhpMixed, RuntimeException, UnexpectedValueException, php_regex, preg_split, strtolower, }; @@ -256,14 +256,8 @@ impl RootPackageLoader { php_regex!(r"{(?:^|\| *|, *)([^,\s#|]+)(?:#[^ ]+)? +as +([^,\s|]+)(?:$| *\|| *,)}"), req_version, ) { - let m1 = m - .get(&CaptureKey::ByIndex(1)) - .unwrap_or_default() - .to_string(); - let m2 = m - .get(&CaptureKey::ByIndex(2)) - .unwrap_or_default() - .to_string(); + let m1 = m.get(1).unwrap_or_default().to_string(); + let m2 = m.get(2).unwrap_or_default().to_string(); let mut alias = IndexMap::new(); alias.insert("package".to_string(), strtolower(req_name)); alias.insert( @@ -324,10 +318,7 @@ impl RootPackageLoader { for constraint in &constraints { if let Some(m) = Preg::is_match3(&pattern, constraint) { let name = strtolower(req_name); - let m1 = m - .get(&CaptureKey::ByIndex(1)) - .unwrap_or_default() - .to_string(); + let m1 = m.get(1).unwrap_or_default().to_string(); let normalized_m1 = VersionParser::normalize_stability(&m1).unwrap_or_default(); let stability = stabilities[normalized_m1.as_str()]; @@ -375,12 +366,7 @@ impl RootPackageLoader { && VersionParser::parse_stability(&req_version) == "dev" { let name = strtolower(req_name); - references.insert( - name, - m.get(&CaptureKey::ByIndex(1)) - .unwrap_or_default() - .to_string(), - ); + references.insert(name, m.get(1).unwrap_or_default().to_string()); } } references diff --git a/crates/shirabe/src/package/locker.rs b/crates/shirabe/src/package/locker.rs index f27f44a2..7d45e573 100644 --- a/crates/shirabe/src/package/locker.rs +++ b/crates/shirabe/src/package/locker.rs @@ -24,7 +24,7 @@ use crate::repository::RootPackageRepository; use crate::util::Git as GitUtil; use crate::util::ProcessExecutor; use indexmap::IndexMap; -use shirabe_pcre::{CaptureKey, Preg}; +use shirabe_pcre::Preg; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ DATE_RFC3339, LogicException, PhpMixed, RuntimeException, array_intersect, array_keys, @@ -848,7 +848,7 @@ impl Locker { output.as_string().unwrap_or(""), ) { let ts = m - .get(&CaptureKey::ByIndex(1)) + .get(1) .unwrap_or_default() .to_string() .parse::<i64>() diff --git a/crates/shirabe/src/package/package.rs b/crates/shirabe/src/package/package.rs index c987f2fe..2e2d5feb 100644 --- a/crates/shirabe/src/package/package.rs +++ b/crates/shirabe/src/package/package.rs @@ -434,11 +434,7 @@ impl Package { self.set_dist_url(Some(Preg::replace_callback( php_regex!("{(/|sha=)[a-f0-9]{40}(/|$)}i"), |m: &shirabe_pcre::PregMatches| -> String { - let get = |i: usize| -> String { - m.get(&shirabe_pcre::CaptureKey::ByIndex(i)) - .unwrap_or_default() - .to_string() - }; + let get = |i: usize| -> String { m.get(i).unwrap_or_default().to_string() }; format!("{}{}{}", get(1), reference, get(2)) }, &self.get_dist_url().unwrap_or_default(), 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) |
