From 530d085d4f3e19f94ac3cf8f8ac3b17000214b2e Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 18 Aug 2026 01:57:02 +0900 Subject: refactor(pcre): inline Preg into its call sites and drop the crate Preg had shed everything it owned: after the last few rounds its methods were one-line forwards to the shim's preg_*(), differing only in a default argument or a wrapper the caller unwrapped anyway. The 460 call sites now name the shim function, and shirabe-pcre is gone from the workspace along with its LICENSE entry. The forwards expand as they read: isMatch becomes preg_match2(.., 0).is_some() (is_none() where PHP negates it), isMatch3 and match3 drop the .is_some(), matchAll counts through preg_match_all2(..).occurrence_count(), and replace4/replace5 spell out the limit and count arguments preg_replace2 takes. Callbacks are the one place the shapes differ: preg_replace_callback carries an error out of the callback, so the fourteen infallible closures wrap their result in Ok() and expect() it back. Config::process() is the fifteenth, and it drops the `error` cell it captured to smuggle a failure past a closure that could only return a String. The `?` in the closure now carries it, which is what the PHP does -- a throw from the callback leaves preg_replace_callback at the failing match rather than running the remaining replacements and reporting the last error. The module doc that explained why composer/pcre's exceptions and *StrictGroups() variants have no counterpart moves to the shim's preg module, where the functions it describes live. Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/src/cache.rs | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'crates/shirabe/src/cache.rs') diff --git a/crates/shirabe/src/cache.rs b/crates/shirabe/src/cache.rs index 47f3219c..80085ff9 100644 --- a/crates/shirabe/src/cache.rs +++ b/crates/shirabe/src/cache.rs @@ -6,11 +6,11 @@ use crate::util::Filesystem; use crate::util::Platform; use crate::util::Silencer; use chrono::Utc; -use shirabe_pcre::Preg; use shirabe_php_shim::{ ErrorException, bin2hex, clearstatcache, date_format_to_strftime, dirname, disk_free_space, file_exists, file_get_contents, file_put_contents, filemtime, function_exists, hash_file, - is_dir, is_writable, mkdir, php_regex, random_bytes, random_int, rename, time, unlink, + is_dir, is_writable, mkdir, php_regex, preg_match2, preg_replace, random_bytes, random_int, + rename, time, unlink, }; use shirabe_symfony_finder::Finder; use std::sync::Mutex; @@ -94,10 +94,12 @@ impl Cache { } pub fn is_usable(path: &str) -> bool { - !Preg::is_match( + preg_match2( php_regex!(r"{(^|[\\\\/])(\$null|nul|NUL|/dev/null)([\\\\/]|$)}"), path, + 0, ) + .is_none() } pub fn is_enabled(&mut self) -> bool { @@ -127,7 +129,7 @@ impl Cache { pub fn read(&mut self, file: &str) -> Option { if self.is_enabled() { - let file = Preg::replace(format!("{{[^{}]}}i", self.allowlist), "-", file); + let file = preg_replace(format!("{{[^{}]}}i", self.allowlist), "-", file); let full_path = format!("{}{}", self.root, file); if file_exists(&full_path) { self.io.write_error3( @@ -147,7 +149,7 @@ impl Cache { let was_enabled = self.enabled == Some(true); if self.is_enabled() && !self.read_only { - let file = Preg::replace(format!("{{[^{}]}}i", self.allowlist), "-", file); + let file = preg_replace(format!("{{[^{}]}}i", self.allowlist), "-", file); self.io.write_error3( &format!("Writing {}{} into cache", self.root, file), @@ -186,11 +188,12 @@ impl Cache { true, crate::io::DEBUG, ); - if let Some(m) = Preg::match3( + if let Some(m) = preg_match2( php_regex!( r"{^file_put_contents\(\): Only ([0-9]+) of ([0-9]+) bytes written}" ), e.get_message(), + 0, ) { // Remove partial file. unlink(&temp_file_name); @@ -226,7 +229,7 @@ impl Cache { /// Copy a file into the cache pub fn copy_from(&mut self, file: &str, source: &str) -> bool { if self.is_enabled() && !self.read_only { - let file = Preg::replace(format!("{{[^{}]}}i", self.allowlist), "-", file); + let file = preg_replace(format!("{{[^{}]}}i", self.allowlist), "-", file); let full_path = format!("{}{}", self.root, file); self.filesystem .borrow_mut() @@ -255,7 +258,7 @@ impl Cache { /// Copy a file out of the cache pub fn copy_to(&mut self, file: &str, target: &str) -> anyhow::Result { if self.is_enabled() { - let file = Preg::replace(format!("{{[^{}]}}i", self.allowlist), "-", file); + let file = preg_replace(format!("{{[^{}]}}i", self.allowlist), "-", file); let full_path = format!("{}{}", self.root, file); if file_exists(&full_path) { let touch_result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| { @@ -315,7 +318,7 @@ impl Cache { pub fn remove(&mut self, file: &str) -> bool { if self.is_enabled() && !self.read_only { - let file = Preg::replace(format!("{{[^{}]}}i", self.allowlist), "-", file); + let file = preg_replace(format!("{{[^{}]}}i", self.allowlist), "-", file); let full_path = format!("{}{}", self.root, file); if file_exists(&full_path) { return self @@ -344,7 +347,7 @@ impl Cache { pub fn get_age(&mut self, file: &str) -> Option { if self.is_enabled() { - let file = Preg::replace(format!("{{[^{}]}}i", self.allowlist), "-", file); + let file = preg_replace(format!("{{[^{}]}}i", self.allowlist), "-", file); let full_path = format!("{}{}", self.root, file); if file_exists(&full_path) && let Some(mtime) = filemtime(&full_path) @@ -461,7 +464,7 @@ impl Cache { pub fn sha1(&mut self, file: &str) -> Option { if self.is_enabled() { - let file = Preg::replace(format!("{{[^{}]}}i", self.allowlist), "-", file); + let file = preg_replace(format!("{{[^{}]}}i", self.allowlist), "-", file); let full_path = format!("{}{}", self.root, file); if file_exists(&full_path) { return hash_file("sha1", &full_path); @@ -473,7 +476,7 @@ impl Cache { pub fn sha256(&mut self, file: &str) -> Option { if self.is_enabled() { - let file = Preg::replace(format!("{{[^{}]}}i", self.allowlist), "-", file); + let file = preg_replace(format!("{{[^{}]}}i", self.allowlist), "-", file); let full_path = format!("{}{}", self.root, file); if file_exists(&full_path) { return hash_file("sha256", &full_path); -- cgit v1.3.1-4-g156e