From e093b2be1c333e67c96aebb0a5291bea9ae3d6db Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 18 Aug 2026 01:57:02 +0900 Subject: refactor(preg): drop the offset argument from preg_match Every call site but one passed offset 0. The remaining one, the UTF-8 chunking loop in Application, slices the subject instead: its pattern has no anchor or lookaround, so matching a suffix is equivalent to starting the search at that offset. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/src/package/locker.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'crates/shirabe/src/package/locker.rs') diff --git a/crates/shirabe/src/package/locker.rs b/crates/shirabe/src/package/locker.rs index fee45fef..017bcb6a 100644 --- a/crates/shirabe/src/package/locker.rs +++ b/crates/shirabe/src/package/locker.rs @@ -28,7 +28,7 @@ use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ DATE_RFC3339, LogicException, PhpMixed, RuntimeException, array_intersect, array_keys, array_map, array_merge, file_get_contents, filemtime, function_exists, hash, in_array_loose, - is_int, ksort, php_regex, preg_match2, realpath, strcmp, strtolower, touch2, trim, usort, + is_int, ksort, php_regex, preg_match, realpath, strcmp, strtolower, touch2, trim, usort, }; use shirabe_seld_json_lint::ParsingException; @@ -823,7 +823,7 @@ impl Locker { ), None, ); - if preg_match2(php_regex!(r"{^\s*\d+\s*$}"), &output_str, 0).is_some() { + if preg_match(php_regex!(r"{^\s*\d+\s*$}"), &output_str).is_some() { let ts = trim(&output_str, None).parse::().unwrap_or(0); datetime = chrono::DateTime::from_timestamp(ts, 0); } @@ -842,10 +842,9 @@ impl Locker { ]), &mut output, path.as_deref(), - )? && let Some(m) = preg_match2( + )? && let Some(m) = preg_match( php_regex!(r"{^\s*(\d+)\s*}"), output.as_string().unwrap_or(""), - 0, ) { let ts = m .get(1) -- cgit v1.3.1-4-g156e