From 716f44031a39c5e43fb441ecc470db76efc23dd4 Mon Sep 17 00:00:00 2001
From: nsfisis <nsfisis@gmail.com>
Date: Sun, 14 Jun 2026 11:24:36 +0900
Subject: refactor(pcre): drop Result from Preg method return types

The Preg methods panic on PCRE failure (per the file header rationale),
so their anyhow::Result wrappers never carried an Err.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../shirabe-class-map-generator/src/class_map.rs   |  4 +---
 .../src/class_map_generator.rs                     | 23 ++++++++--------------
 .../src/php_file_cleaner.rs                        |  6 ++----
 .../src/php_file_parser.rs                         |  4 ++--
 4 files changed, 13 insertions(+), 24 deletions(-)

(limited to 'crates/shirabe-class-map-generator')

diff --git a/crates/shirabe-class-map-generator/src/class_map.rs b/crates/shirabe-class-map-generator/src/class_map.rs
index 264fd35..8a29373 100644
--- a/crates/shirabe-class-map-generator/src/class_map.rs
+++ b/crates/shirabe-class-map-generator/src/class_map.rs
@@ -67,9 +67,7 @@ impl ClassMap {
         for (class, paths) in &self.ambiguous_classes {
             let paths: Vec<String> = paths
                 .iter()
-                .filter(|path| {
-                    !Preg::is_match(duplicates_filter, &strtr(path, "\\", "/")).unwrap_or(false)
-                })
+                .filter(|path| !Preg::is_match(duplicates_filter, &strtr(path, "\\", "/")))
                 .cloned()
                 .collect();
             if !paths.is_empty() {
diff --git a/crates/shirabe-class-map-generator/src/class_map_generator.rs b/crates/shirabe-class-map-generator/src/class_map_generator.rs
index ba59b33..fa55fac 100644
--- a/crates/shirabe-class-map-generator/src/class_map_generator.rs
+++ b/crates/shirabe-class-map-generator/src/class_map_generator.rs
@@ -169,14 +169,12 @@ impl ClassMapGenerator {
                 continue;
             }
 
-            let is_stream_wrapper_path =
-                Preg::is_match(&self.stream_wrappers_regex, &file_path).unwrap_or(false);
+            let is_stream_wrapper_path = Preg::is_match(&self.stream_wrappers_regex, &file_path);
             if !Self::is_absolute_path(&file_path) && !is_stream_wrapper_path {
                 file_path = format!("{}/{}", cwd, file_path);
                 file_path = Self::normalize_path(&file_path);
             } else {
-                file_path =
-                    Preg::replace(r"{(?<!:)[\\/]{2,}}", "/", &file_path).unwrap_or(file_path);
+                file_path = Preg::replace(r"{(?<!:)[\\/]{2,}}", "/", &file_path);
             }
 
             if file_path.is_empty() {
@@ -213,11 +211,11 @@ impl ClassMapGenerator {
 
             // check the realpath of the file against the excluded paths as the path might be a symlink and the excluded path is realpath'd so symlink are resolved
             if let Some(ref excluded) = excluded {
-                if Preg::is_match(excluded, &strtr(&real_path, "\\", "/")).unwrap_or(false) {
+                if Preg::is_match(excluded, &strtr(&real_path, "\\", "/")) {
                     continue;
                 }
                 // check non-realpath of file for directories symlink in project dir
-                if Preg::is_match(excluded, &strtr(&file_path, "\\", "/")).unwrap_or(false) {
+                if Preg::is_match(excluded, &strtr(&file_path, "\\", "/")) {
                     continue;
                 }
             }
@@ -332,14 +330,12 @@ impl ClassMapGenerator {
                 &format!("{{^{}}}", preg_quote(&cwd, None)),
                 ".",
                 &Self::normalize_path(file_path),
-            )
-            .unwrap_or_else(|_| Self::normalize_path(file_path));
+            );
             let short_base_path = Preg::replace(
                 &format!("{{^{}}}", preg_quote(&cwd, None)),
                 ".",
                 &Self::normalize_path(base_path),
-            )
-            .unwrap_or_else(|_| Self::normalize_path(base_path));
+            );
 
             for class in rejected_classes {
                 self.class_map.add_psr_violation(
@@ -385,9 +381,7 @@ impl ClassMapGenerator {
             r"{^( [0-9a-z]{2,}+: (?: // (?: [a-z]: )? )? | [a-z]: )}ix",
             &path,
             Some(&mut r#match),
-        )
-        .unwrap_or(false)
-        {
+        ) {
             prefix = r#match
                 .get(&CaptureKey::ByIndex(1))
                 .cloned()
@@ -421,8 +415,7 @@ impl ClassMapGenerator {
                     .to_uppercase()
             },
             &prefix,
-        )
-        .unwrap_or(prefix);
+        );
 
         format!("{}{}{}", prefix, absolute, parts.join("/"))
     }
diff --git a/crates/shirabe-class-map-generator/src/php_file_cleaner.rs b/crates/shirabe-class-map-generator/src/php_file_cleaner.rs
index 2b53307..2b97d34 100644
--- a/crates/shirabe-class-map-generator/src/php_file_cleaner.rs
+++ b/crates/shirabe-class-map-generator/src/php_file_cleaner.rs
@@ -129,9 +129,7 @@ impl PhpFileCleaner {
                                 Some(&mut r#match),
                                 0,
                                 offset,
-                            )
-                            .unwrap_or(false)
-                            {
+                            ) {
                                 return clean
                                     + r#match
                                         .get(&CaptureKey::ByIndex(0))
@@ -268,6 +266,6 @@ impl PhpFileCleaner {
     }
 
     fn r#match(&self, regex: &str, r#match: Option<&mut IndexMap<CaptureKey, String>>) -> bool {
-        Preg::is_match5(regex, &self.contents, r#match, 0, self.index).unwrap_or(false)
+        Preg::is_match5(regex, &self.contents, r#match, 0, self.index)
     }
 }
diff --git a/crates/shirabe-class-map-generator/src/php_file_parser.rs b/crates/shirabe-class-map-generator/src/php_file_parser.rs
index a086d78..323ca05 100644
--- a/crates/shirabe-class-map-generator/src/php_file_parser.rs
+++ b/crates/shirabe-class-map-generator/src/php_file_parser.rs
@@ -68,7 +68,7 @@ impl PhpFileParser {
 
         // return early if there is no chance of matching anything in this file
         let pattern = format!("{{\\b(?:class|interface|trait{})\\s}}i", extra_types);
-        let max_matches = Preg::match_all(&pattern, &contents)?;
+        let max_matches = Preg::match_all(&pattern, &contents);
         if max_matches == 0 {
             return Ok(vec![]);
         }
@@ -86,7 +86,7 @@ impl PhpFileParser {
             et = extra_types
         );
         let mut matches: IndexMap<_, _> = IndexMap::new();
-        Preg::match_all3(&pattern2, &contents, Some(&mut matches))?;
+        Preg::match_all3(&pattern2, &contents, Some(&mut matches));
 
         let mut classes = vec![];
         let mut namespace = String::new();
-- 
cgit v1.3.1