aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-symfony-finder
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-17 08:05:42 +0900
committernsfisis <nsfisis@gmail.com>2026-08-17 08:05:42 +0900
commit79b504e55cd4c4d1da102c3a076dc2a2e1edcd65 (patch)
tree2c12198742f289de49b9b77a2c2ad66ef417405c /crates/shirabe-symfony-finder
parent9fd6aecad27240ccedab4487f6c157914142ca47 (diff)
downloadphp-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-symfony-finder')
-rw-r--r--crates/shirabe-symfony-finder/src/finder.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/crates/shirabe-symfony-finder/src/finder.rs b/crates/shirabe-symfony-finder/src/finder.rs
index 27a7d2d6..cc78ebe3 100644
--- a/crates/shirabe-symfony-finder/src/finder.rs
+++ b/crates/shirabe-symfony-finder/src/finder.rs
@@ -642,9 +642,9 @@ fn is_regex(str: &str) -> bool {
// PHP 8.2+ available modifiers.
let available_modifiers = "imsxuADUn";
- let mut matches = PregMatchedGroups::new();
+ let matches = PregMatchedGroups::new();
let pattern = format!("/^(.{{3,}}?)[{available_modifiers}]*$/");
- if Preg::is_match3(&pattern, str, Some(&mut matches)) {
+ if let Some(matches) = Preg::is_match3(&pattern, str) {
let group = matches
.get(&CaptureKey::ByIndex(1))
.cloned()
@@ -688,10 +688,9 @@ fn comparator_test(operator: &str, test: i64, target: i64) -> bool {
/// `DateComparator::__construct`, returning `(operator, target unix timestamp)`.
fn parse_date_comparator(test: &str) -> (String, i64) {
let pattern = "#^\\s*(==|!=|[<>]=?|after|since|before|until)?\\s*(.+?)\\s*$#i";
- let mut matches = PregMatchedGroups::new();
- if !Preg::is_match3(pattern, test, Some(&mut matches)) {
+ let Some(matches) = Preg::is_match3(pattern, test) else {
panic!("Don't understand \"{test}\" as a date test.");
- }
+ };
let date = matches
.get(&CaptureKey::ByIndex(2))