aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/repository/composer_repository.rs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-18 01:57:02 +0900
committernsfisis <nsfisis@gmail.com>2026-08-18 01:57:02 +0900
commit0caac63bacefb9a1f62848636d47fca07f592bba (patch)
tree8d2ef66e597a8d8c228d3ba2490a59f48b26db4d /crates/shirabe/src/repository/composer_repository.rs
parent34c74255d781ad0a0bf7cc5ad4ec1761bef61e04 (diff)
downloadphp-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/repository/composer_repository.rs')
-rw-r--r--crates/shirabe/src/repository/composer_repository.rs20
1 files changed, 5 insertions, 15 deletions
diff --git a/crates/shirabe/src/repository/composer_repository.rs b/crates/shirabe/src/repository/composer_repository.rs
index d42a9778..8970a227 100644
--- a/crates/shirabe/src/repository/composer_repository.rs
+++ b/crates/shirabe/src/repository/composer_repository.rs
@@ -37,7 +37,7 @@ use futures::StreamExt;
use futures::stream::FuturesOrdered;
use indexmap::IndexMap;
use shirabe_metadata_minifier::MetadataMinifier;
-use shirabe_pcre::{CaptureKey, Preg};
+use shirabe_pcre::Preg;
use shirabe_php_shim::Catch as _;
use shirabe_php_shim::{
AnyThrowable, CmpOp, InvalidArgumentException, LogicException, PHP_EOL, PhpMixed,
@@ -250,7 +250,7 @@ impl ComposerRepository {
&url,
) {
let proto = match_packagist
- .get(&CaptureKey::ByName("proto".to_string()))
+ .name("proto")
.unwrap_or_default()
.to_string();
url = format!("{}://repo.packagist.org", proto);
@@ -784,14 +784,8 @@ impl ComposerRepository {
&query,
) && let Some(list_url) = self.list_url.as_ref()
{
- let q = match_groups
- .get(&CaptureKey::ByName("query".to_string()))
- .unwrap_or_default()
- .to_string();
- let vendor = match_groups
- .get(&CaptureKey::ByName("vendor".to_string()))
- .unwrap_or_default()
- .to_string();
+ let q = match_groups.name("query").unwrap_or_default().to_string();
+ let vendor = match_groups.name("vendor").unwrap_or_default().to_string();
let url = format!(
"{}?vendor={}&filter={}",
list_url,
@@ -2427,11 +2421,7 @@ impl ComposerRepository {
if url.starts_with('/') {
if let Some(matches) = Preg::is_match3(php_regex!(r"{^[^:]++://[^/]*+}"), &self.url) {
- return Ok(format!(
- "{}{}",
- matches.get(&CaptureKey::ByIndex(0)).unwrap_or_default(),
- url
- ));
+ return Ok(format!("{}{}", matches.get(0).unwrap_or_default(), url));
}
return Ok(self.url.clone());