diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-17 08:05:42 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-17 08:05:42 +0900 |
| commit | 79b504e55cd4c4d1da102c3a076dc2a2e1edcd65 (patch) | |
| tree | 2c12198742f289de49b9b77a2c2ad66ef417405c /crates/shirabe/src/autoload | |
| parent | 9fd6aecad27240ccedab4487f6c157914142ca47 (diff) | |
| download | php-shirabe-79b504e55cd4c4d1da102c3a076dc2a2e1edcd65.tar.gz php-shirabe-79b504e55cd4c4d1da102c3a076dc2a2e1edcd65.tar.zst php-shirabe-79b504e55cd4c4d1da102c3a076dc2a2e1edcd65.zip | |
refactor(pcre): return the Preg $matches instead of filling an out-param
`Composer\Pcre\Preg` fills `$matches` through a by-ref parameter, and the
port mirrored that with a `&mut` (or `Option<&mut>`) out-param plus a
bool or count return. Callers had to declare an empty map one line ahead
of the call, and the type never said the map is only meaningful when the
call matched. Return the matches instead:
- match3/match4/is_match3/is_match4 -> Option<PregMatchedGroups>
- is_match_named -> Option<PregNamedGroups>
- match_all2/is_match_all -> PregMatchesAll
- is_match_all_with_offsets3 -> PregMatchesAllWithOffsets
Nothing is lost: the bool is `Option::is_some()`, and the occurrence
count is the length of any one column of a PREG_PATTERN_ORDER map, now
spelled `PregMatchesAll::occurrence_count()`. is_match() still answers
the bool question directly for callers that want no groups.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/autoload')
| -rw-r--r-- | crates/shirabe/src/autoload/autoload_generator.rs | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/crates/shirabe/src/autoload/autoload_generator.rs b/crates/shirabe/src/autoload/autoload_generator.rs index 9a4a4c26..b6835b61 100644 --- a/crates/shirabe/src/autoload/autoload_generator.rs +++ b/crates/shirabe/src/autoload/autoload_generator.rs @@ -559,12 +559,9 @@ return array( { let content = file_get_contents(format!("{}/autoload.php", vendor_path)).unwrap_or_default(); - let mut matches = PregMatchedGroups::new(); - if Preg::match3( - php_regex!("{ComposerAutoloaderInit([^:\\s]+)::}"), - &content, - Some(&mut matches), - ) { + if let Some(matches) = + Preg::match3(php_regex!("{ComposerAutoloaderInit([^:\\s]+)::}"), &content) + { suffix = matches.get(&CaptureKey::ByIndex(1)).cloned(); } } @@ -1155,12 +1152,8 @@ return array( let package = &item.0; let links = array_merge_map(package.get_replaces(), package.get_provides()); for (_k, link) in &links { - let mut matches = PregMatchedGroups::new(); - if Preg::match3( - php_regex!("{^ext-(.+)$}iD"), - link.get_target(), - Some(&mut matches), - ) && let Some(ext) = matches.get(&CaptureKey::ByIndex(1)).cloned() + if let Some(matches) = Preg::match3(php_regex!("{^ext-(.+)$}iD"), link.get_target()) + && let Some(ext) = matches.get(&CaptureKey::ByIndex(1)).cloned() { extension_providers .entry(ext) @@ -1201,13 +1194,9 @@ return array( required_php_64bit = true; } - let mut matches = PregMatchedGroups::new(); if check_platform.as_bool() == Some(true) - && Preg::match3( - php_regex!("{^ext-(.+)$}iD"), - link.get_target(), - Some(&mut matches), - ) + && let Some(matches) = + Preg::match3(php_regex!("{^ext-(.+)$}iD"), link.get_target()) { let ext_key = matches .get(&CaptureKey::ByIndex(1)) |
