From b7ffae965e39bfd6023994305b97a99c000cbf81 Mon Sep 17 00:00:00 2001
From: nsfisis <nsfisis@gmail.com>
Date: Sun, 14 Jun 2026 13:30:49 +0900
Subject: refactor(pcre): take &mut matches in preg_*2 shim helpers

The optional matches output was always passed Some(&mut ...) at every
call site, so the Option wrapper added no value. Take &mut directly and
inline the former internal helpers.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 crates/shirabe-external-packages/src/composer/pcre/preg.rs     | 10 +++++-----
 .../src/symfony/console/input/string_input.rs                  |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'crates/shirabe-external-packages')

diff --git a/crates/shirabe-external-packages/src/composer/pcre/preg.rs b/crates/shirabe-external-packages/src/composer/pcre/preg.rs
index 4034649..72800dd 100644
--- a/crates/shirabe-external-packages/src/composer/pcre/preg.rs
+++ b/crates/shirabe-external-packages/src/composer/pcre/preg.rs
@@ -41,7 +41,7 @@ impl Preg {
         let result = shirabe_php_shim::preg_match2(
             pattern,
             subject,
-            Some(&mut internal),
+            &mut internal,
             flags | PREG_UNMATCHED_AS_NULL,
             offset,
         );
@@ -79,7 +79,7 @@ impl Preg {
         let result = shirabe_php_shim::preg_match_all2(
             pattern,
             subject,
-            Some(&mut internal),
+            &mut internal,
             flags | PREG_UNMATCHED_AS_NULL,
             offset,
         );
@@ -104,7 +104,7 @@ impl Preg {
         let result = shirabe_php_shim::preg_match_all_offset_capture2(
             pattern,
             subject,
-            Some(&mut internal),
+            &mut internal,
             flags | PREG_UNMATCHED_AS_NULL | PREG_OFFSET_CAPTURE,
             offset,
         );
@@ -222,7 +222,7 @@ impl Preg {
         let result = shirabe_php_shim::preg_match2(
             pattern,
             subject,
-            Some(&mut internal),
+            &mut internal,
             PREG_UNMATCHED_AS_NULL,
             0,
         );
@@ -241,7 +241,7 @@ impl Preg {
         // Classic preg_match semantics (no PREG_UNMATCHED_AS_NULL): trailing
         // unmatched groups are truncated, interior unmatched groups become "".
         let mut internal: IndexMap<CaptureKey, Option<String>> = IndexMap::new();
-        let result = shirabe_php_shim::preg_match2(pattern, subject, Some(&mut internal), 0, 0);
+        let result = shirabe_php_shim::preg_match2(pattern, subject, &mut internal, 0, 0);
 
         if !result {
             return None;
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs
index 03aaa64..4dbc4e1 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs
@@ -55,7 +55,7 @@ impl StringInput {
             }
 
             let mut m: IndexMap<CaptureKey, Option<String>> = IndexMap::new();
-            if shirabe_php_shim::preg_match2(r"/\s+/A", input, Some(&mut m), 0, cursor as usize) {
+            if shirabe_php_shim::preg_match2(r"/\s+/A", input, &mut m, 0, cursor as usize) {
                 if token.is_some() {
                     tokens.push(token.take().unwrap());
                 }
@@ -64,7 +64,7 @@ impl StringInput {
             } else if shirabe_php_shim::preg_match2(
                 &format!(r#"/([^="'\s]+?)(=?)({}+)/A"#, Self::REGEX_QUOTED_STRING),
                 input,
-                Some(&mut m),
+                &mut m,
                 0,
                 cursor as usize,
             ) {
@@ -87,7 +87,7 @@ impl StringInput {
             } else if shirabe_php_shim::preg_match2(
                 &format!(r"/{}/A", Self::REGEX_QUOTED_STRING),
                 input,
-                Some(&mut m),
+                &mut m,
                 0,
                 cursor as usize,
             ) {
@@ -105,7 +105,7 @@ impl StringInput {
             } else if shirabe_php_shim::preg_match2(
                 &format!(r"/{}/A", Self::REGEX_UNQUOTED_STRING),
                 input,
-                Some(&mut m),
+                &mut m,
                 0,
                 cursor as usize,
             ) {
-- 
cgit v1.3.1