From fcc6ee5a13cd2e2b27fff66dcfc7e9e1f062a653 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Mon, 17 Aug 2026 02:41:21 +0900 Subject: refactor(preg): drop unused args of preg_match_all_offset_capture2() The sole caller, Preg::match_all_with_offsets5(), always passed flags=0 and offset=0, so PREG_UNMATCHED_AS_NULL is now unconditional and the subject is scanned from the beginning. That method is only reached from Preg::match_all_with_offsets(), so it is no longer public either. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe-pcre/src/preg.rs | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'crates/shirabe-pcre') diff --git a/crates/shirabe-pcre/src/preg.rs b/crates/shirabe-pcre/src/preg.rs index 95697e83..a761608e 100644 --- a/crates/shirabe-pcre/src/preg.rs +++ b/crates/shirabe-pcre/src/preg.rs @@ -83,23 +83,13 @@ impl Preg { result } - pub fn match_all_with_offsets5( + fn match_all_with_offsets5( pattern: impl PregPattern, subject: &str, matches: Option<&mut IndexMap>>, - flags: i64, - offset: usize, ) -> usize { - Self::check_set_order(flags); - let mut internal: IndexMap, i64)>> = IndexMap::new(); - let result = preg_match_all_offset_capture2( - pattern, - subject, - &mut internal, - flags | PREG_UNMATCHED_AS_NULL | PREG_OFFSET_CAPTURE, - offset, - ); + let result = preg_match_all_offset_capture2(pattern, subject, &mut internal); if let Some(out) = matches { *out = null_to_empty_offset_match_all(internal); @@ -263,7 +253,7 @@ impl Preg { subject: &str, matches: Option<&mut IndexMap>>, ) -> bool { - Self::match_all_with_offsets5(pattern, subject, matches, 0, 0) > 0 + Self::match_all_with_offsets5(pattern, subject, matches) > 0 } fn check_offset_capture(flags: i64, use_function_name: &str) { -- cgit v1.3.1-4-g156e