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>

1 files changed, 28 insertions, 37 deletions

diff --git a/crates/shirabe/src/repository/vcs/hg_driver.rs b/crates/shirabe/src/repository/vcs/hg_driver.rs
index d617099e..0933a643 100644
--- a/crates/shirabe/src/repository/vcs/hg_driver.rs
+++ b/crates/shirabe/src/repository/vcs/hg_driver.rs
@@ -11,7 +11,7 @@ use crate::util::Hg as HgUtils;
 use crate::util::Url;
 use chrono::{DateTime, FixedOffset, Utc};
 use indexmap::IndexMap;
-use shirabe_pcre::{CaptureKey, Preg, PregMatchedGroups};
+use shirabe_pcre::{CaptureKey, Preg};
 use shirabe_php_shim::Catch as _;
 use shirabe_php_shim::{PhpMixed, RuntimeException, dirname, is_dir, is_writable, php_regex};
 
@@ -232,14 +232,13 @@ impl HgDriver {
                 Some(&self.repo_dir),
             );
             for tag in self.inner.process.borrow().split_lines(&output) {
-                if !tag.is_empty() {
-                    let mut m = PregMatchedGroups::new();
-                    if Preg::match3(php_regex!(r"(^([^\s]+)\s+\d+:(.*)$)"), &tag, Some(&mut m)) {
-                        tags.insert(
-                            m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(),
-                            m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(),
-                        );
-                    }
+                if !tag.is_empty()
+                    && let Some(m) = Preg::match3(php_regex!(r"(^([^\s]+)\s+\d+:(.*)$)"), &tag)
+                {
+                    tags.insert(
+                        m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default(),
+                        m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(),
+                    );
                 }
             }
             tags.shift_remove("tip");
@@ -262,20 +261,16 @@ impl HgDriver {
                 Some(&self.repo_dir),
             );
             for branch in self.inner.process.borrow().split_lines(&output) {
-                if !branch.is_empty() {
-                    let mut m = PregMatchedGroups::new();
-                    if Preg::match3(
-                        php_regex!(r"(^([^\s]+)\s+\d+:([a-f0-9]+))"),
-                        &branch,
-                        Some(&mut m),
-                    ) {
-                        let name = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default();
-                        if !name.starts_with('-') {
-                            branches.insert(
-                                name,
-                                m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(),
-                            );
-                        }
+                if !branch.is_empty()
+                    && let Some(m) =
+                        Preg::match3(php_regex!(r"(^([^\s]+)\s+\d+:([a-f0-9]+))"), &branch)
+                {
+                    let name = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default();
+                    if !name.starts_with('-') {
+                        branches.insert(
+                            name,
+                            m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(),
+                        );
                     }
                 }
             }
@@ -287,20 +282,16 @@ impl HgDriver {
                 Some(&self.repo_dir),
             );
             for branch in self.inner.process.borrow().split_lines(&output) {
-                if !branch.is_empty() {
-                    let mut m = PregMatchedGroups::new();
-                    if Preg::match3(
-                        php_regex!(r"(^(?:[\s*]*)([^\s]+)\s+\d+:(.*)$)"),
-                        &branch,
-                        Some(&mut m),
-                    ) {
-                        let name = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default();
-                        if !name.starts_with('-') {
-                            bookmarks.insert(
-                                name,
-                                m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(),
-                            );
-                        }
+                if !branch.is_empty()
+                    && let Some(m) =
+                        Preg::match3(php_regex!(r"(^(?:[\s*]*)([^\s]+)\s+\d+:(.*)$)"), &branch)
+                {
+                    let name = m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default();
+                    if !name.starts_with('-') {
+                        bookmarks.insert(
+                            name,
+                            m.get(&CaptureKey::ByIndex(2)).cloned().unwrap_or_default(),
+                        );
                     }
                 }
             }