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/downloader/svn_downloader.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/shirabe/src/downloader/svn_downloader.rs') diff --git a/crates/shirabe/src/downloader/svn_downloader.rs b/crates/shirabe/src/downloader/svn_downloader.rs index a31e89c9..42152eb3 100644 --- a/crates/shirabe/src/downloader/svn_downloader.rs +++ b/crates/shirabe/src/downloader/svn_downloader.rs @@ -16,8 +16,8 @@ use crate::util::ProcessExecutor; use crate::util::Svn as SvnUtil; use indexmap::IndexMap; use shirabe_php_shim::{ - CmpOp, PhpMixed, RuntimeException, impl_php_class, is_dir, php_regex, preg_match2, - preg_replace, preg_split, version_compare, + CmpOp, PhpMixed, RuntimeException, impl_php_class, is_dir, php_regex, preg_match, preg_replace, + preg_split, version_compare, }; #[derive(Debug)] @@ -353,8 +353,8 @@ impl VcsDownloader for SvnDownloader { to_reference: &str, path: &str, ) -> anyhow::Result { - if preg_match2(php_regex!(r"{@(\d+)$}"), from_reference, 0).is_some() - && preg_match2(php_regex!(r"{@(\d+)$}"), to_reference, 0).is_some() + if preg_match(php_regex!(r"{@(\d+)$}"), from_reference).is_some() + && preg_match(php_regex!(r"{@(\d+)$}"), to_reference).is_some() { // retrieve the svn base url from the checkout folder let command = vec![ @@ -382,7 +382,7 @@ impl VcsDownloader for SvnDownloader { } let url_pattern = "#(.*)#"; - let base_url = if let Some(matches) = preg_match2(url_pattern, &output, 0) { + let base_url = if let Some(matches) = preg_match(url_pattern, &output) { matches.get(1).unwrap_or_default().to_string() } else { return Err(RuntimeException::new(format!( @@ -453,7 +453,7 @@ impl ChangeReportInterface for SvnDownloader { ); Ok( - if preg_match2(php_regex!("{^ *[^X ] +}m"), &output, 0).is_some() { + if preg_match(php_regex!("{^ *[^X ] +}m"), &output).is_some() { Some(output) } else { None -- cgit v1.3.1-4-g156e