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/archiver/archive_manager.rs | 4 ++-- crates/shirabe/src/package/archiver/base_exclude_filter.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/shirabe/src/package/archiver') diff --git a/crates/shirabe/src/package/archiver/archive_manager.rs b/crates/shirabe/src/package/archiver/archive_manager.rs index 4f9e2ddc..83d5cc94 100644 --- a/crates/shirabe/src/package/archiver/archive_manager.rs +++ b/crates/shirabe/src/package/archiver/archive_manager.rs @@ -11,7 +11,7 @@ use crate::util::SyncHelper; use crate::util::r#loop::Loop; use indexmap::IndexMap; use shirabe_php_shim::{ - InvalidArgumentException, RuntimeException, bin2hex, file_exists, php_regex, preg_match2, + InvalidArgumentException, RuntimeException, bin2hex, file_exists, php_regex, preg_match, preg_replace, random_bytes, realpath, sys_get_temp_dir, }; @@ -65,7 +65,7 @@ impl ArchiveManager { let dist_reference = package.get_dist_reference(); if let Some(ref dist_ref) = dist_reference { - if preg_match2(php_regex!("{^[a-f0-9]{40}$}"), dist_ref, 0).is_some() { + if preg_match(php_regex!("{^[a-f0-9]{40}$}"), dist_ref).is_some() { parts.insert("dist_reference".to_string(), dist_ref.to_string()); if let Some(dist_type) = package.get_dist_type() { parts.insert("dist_type".to_string(), dist_type); diff --git a/crates/shirabe/src/package/archiver/base_exclude_filter.rs b/crates/shirabe/src/package/archiver/base_exclude_filter.rs index 16a189a8..8186e95c 100644 --- a/crates/shirabe/src/package/archiver/base_exclude_filter.rs +++ b/crates/shirabe/src/package/archiver/base_exclude_filter.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Package/Archiver/BaseExcludeFilter.php -use shirabe_php_shim::preg_match2; +use shirabe_php_shim::preg_match; use shirabe_symfony_finder::Glob; #[derive(Debug)] @@ -86,7 +86,7 @@ pub trait BaseExcludeFilter { relative_path }; - if preg_match2(pattern, path, 0).is_some() { + if preg_match(pattern, path).is_some() { exclude = !negate; } } -- cgit v1.3.1-4-g156e