From 78157ab3ffeca37023381a422fccda2d4a0c64af Mon Sep 17 00:00:00 2001
From: nsfisis <nsfisis@gmail.com>
Date: Sun, 14 Jun 2026 04:01:45 +0900
Subject: refactor(pcre): drop strict-groups Preg variants

Rust's type system already distinguishes participating from
non-participating capture groups via Option, so the *StrictGroups
methods add no safety here. Remove them and switch callers to the
plain variants.
---
 crates/shirabe/src/package/version/version_guesser.rs | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'crates/shirabe/src/package/version')

diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs
index da67d56..562d141 100644
--- a/crates/shirabe/src/package/version/version_guesser.rs
+++ b/crates/shirabe/src/package/version/version_guesser.rs
@@ -210,11 +210,9 @@ impl VersionGuesser {
             for branch in self.process.borrow().split_lines(&output) {
                 if !branch.is_empty() {
                     let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
-                        r"{^(?:\* ) *(\(no branch\)|\(detached from \S+\)|\(HEAD detached at \S+\)|\S+) *([a-f0-9]+) .*$}",
-                        &branch,
-                        Some(&mut m),
-                    )
+                    if Preg::is_match3(r"{^(?:\* ) *(\(no branch\)|\(detached from \S+\)|\(HEAD detached at \S+\)|\S+) *([a-f0-9]+) .*$}",
+                    &branch,
+                    Some(&mut m),)
                     .unwrap_or(false)
                     {
                         let g1 = m
@@ -245,11 +243,10 @@ impl VersionGuesser {
 
                 if !branch.is_empty() && {
                     let mut tmp: IndexMap<CaptureKey, String> = IndexMap::new();
-                    !Preg::is_match_strict_groups3(r"{^ *.+/HEAD }", &branch, Some(&mut tmp))
-                        .unwrap_or(false)
+                    !Preg::is_match3(r"{^ *.+/HEAD }", &branch, Some(&mut tmp)).unwrap_or(false)
                 } {
                     let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
-                    if Preg::is_match_strict_groups3(
+                    if Preg::is_match3(
                         r"{^(?:\* )? *((?:remotes/(?:origin|upstream)/)?[^\s/]+) *([a-f0-9]+) .*$}",
                         &branch,
                         Some(&mut m),
@@ -761,9 +758,7 @@ impl VersionGuesser {
             }
         };
         let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
-        if Preg::is_match_strict_groups3(r"{^(\d+(?:\.\d+)*)-dev$}i", &version, Some(&mut m))
-            .unwrap_or(false)
-        {
+        if Preg::is_match3(r"{^(\d+(?:\.\d+)*)-dev$}i", &version, Some(&mut m)).unwrap_or(false) {
             return Ok(format!(
                 "{}.x-dev",
                 m.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default()
-- 
cgit v1.3.1