From 79b504e55cd4c4d1da102c3a076dc2a2e1edcd65 Mon Sep 17 00:00:00 2001
From: nsfisis <nsfisis@gmail.com>
Date: Mon, 17 Aug 2026 08:05:42 +0900
Subject: 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>
---
 crates/shirabe/src/repository/vcs/gitlab_driver.rs | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'crates/shirabe/src/repository/vcs/gitlab_driver.rs')

diff --git a/crates/shirabe/src/repository/vcs/gitlab_driver.rs b/crates/shirabe/src/repository/vcs/gitlab_driver.rs
index c141cc9a..1887ddc4 100644
--- a/crates/shirabe/src/repository/vcs/gitlab_driver.rs
+++ b/crates/shirabe/src/repository/vcs/gitlab_driver.rs
@@ -15,7 +15,7 @@ use crate::util::HttpDownloader;
 use crate::util::http::Response;
 use chrono::{DateTime, FixedOffset};
 use indexmap::IndexMap;
-use shirabe_pcre::{CaptureKey, Preg, PregMatchedGroups};
+use shirabe_pcre::{CaptureKey, Preg};
 use shirabe_php_shim::Catch as _;
 use shirabe_php_shim::{
     InvalidArgumentException, LogicException, PhpMixed, RuntimeException, array_search_mixed,
@@ -81,14 +81,13 @@ impl GitLabDriver {
     ///
     /// SSH urls use https by default. Set "secure-http": false on the repository config to use http instead.
     pub fn initialize(&mut self) -> anyhow::Result<()> {
-        let mut match_ = PregMatchedGroups::new();
-        if !Preg::is_match3(Self::URL_REGEX, &self.inner.url, Some(&mut match_)) {
+        let Some(match_) = Preg::is_match3(Self::URL_REGEX, &self.inner.url) else {
             return Err(InvalidArgumentException::new(format!(
                 "The GitLab repository URL {} is invalid. It must be the HTTP URL of a GitLab project.",
                 self.inner.url.clone(),
             ))
             .into());
-        }
+        };
 
         let guessed_domain = match_
             .get(&CaptureKey::ByName("domain".to_string()))
@@ -945,10 +944,9 @@ impl GitLabDriver {
         url: &str,
         _deep: bool,
     ) -> anyhow::Result<bool> {
-        let mut match_ = PregMatchedGroups::new();
-        if !Preg::is_match3(Self::URL_REGEX, url, Some(&mut match_)) {
+        let Some(match_) = Preg::is_match3(Self::URL_REGEX, url) else {
             return Ok(false);
-        }
+        };
 
         let scheme = match_
             .get(&CaptureKey::ByName("scheme".to_string()))
@@ -1011,12 +1009,7 @@ impl GitLabDriver {
 
         let links = explode(",", &header);
         for link in &links {
-            let mut match_ = PregMatchedGroups::new();
-            if Preg::is_match3(
-                php_regex!(r#"{<(.+?)>; *rel="next"}"#),
-                link,
-                Some(&mut match_),
-            ) {
+            if let Some(match_) = Preg::is_match3(php_regex!(r#"{<(.+?)>; *rel="next"}"#), link) {
                 return Some(
                     match_
                         .get(&CaptureKey::ByIndex(1))
-- 
cgit v1.3.1-4-g156e