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/json/json_file.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'crates/shirabe/src/json/json_file.rs') diff --git a/crates/shirabe/src/json/json_file.rs b/crates/shirabe/src/json/json_file.rs index 3bfff4d3..8d992449 100644 --- a/crates/shirabe/src/json/json_file.rs +++ b/crates/shirabe/src/json/json_file.rs @@ -13,7 +13,7 @@ use shirabe_php_shim::{ InvalidArgumentException, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE, PhpMixed, PregMatches, RuntimeException, UnexpectedValueException, dirname, file_exists, file_get_contents, file_put_contents, is_dir, is_file, json_decode_assoc, json_decode_obj, - json_encode_ex, mkdir, php_regex, preg_match2, preg_replace_callback, preg_replace2, realpath, + json_encode_ex, mkdir, php_regex, preg_match, preg_replace_callback, preg_replace2, realpath, str_repeat, strlen, strpos, usleep, }; use shirabe_seld_json_lint::{ParsingException, ParsingExceptionDetails}; @@ -107,9 +107,7 @@ impl JsonFile { http_downloader: Option>>, io: Option>>, ) -> anyhow::Result { - if http_downloader.is_none() - && preg_match2(php_regex!(r"{^https?://}i"), &path, 0).is_some() - { + if http_downloader.is_none() && preg_match(php_regex!(r"{^https?://}i"), &path).is_some() { return Err(InvalidArgumentException::new( "http urls require a HttpDownloader instance to be passed".to_string(), ) @@ -554,7 +552,7 @@ impl JsonFile { } pub fn detect_indenting(json: Option<&str>) -> String { - if let Some(m) = preg_match2(php_regex!(r##"#^([ \t]+)"#m"##), json.unwrap_or(""), 0) { + if let Some(m) = preg_match(php_regex!(r##"#^([ \t]+)"#m"##), json.unwrap_or("")) { return m.get(1).unwrap_or_default().to_string(); } -- cgit v1.3.1-4-g156e