diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-17 04:18:59 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-17 04:18:59 +0900 |
| commit | 704ba2d87733657dea852fa697fc6d23a961a71b (patch) | |
| tree | fd96f0fb4c2fb334a6480088a4c542bd60603f65 /crates/shirabe/src/downloader | |
| parent | dc0cc70f6916810f326d6019a4bec90ca2915904 (diff) | |
| download | php-shirabe-704ba2d87733657dea852fa697fc6d23a961a71b.tar.gz php-shirabe-704ba2d87733657dea852fa697fc6d23a961a71b.tar.zst php-shirabe-704ba2d87733657dea852fa697fc6d23a961a71b.zip | |
refactor(preg): replace Preg::split*() with shim preg_split*()
preg_split2()'s limit was always -1 and its flags were always either 0 or
PREG_SPLIT_DELIM_CAPTURE alone, so both arguments are gone: the shim now
exposes preg_split() and preg_split_delim_capture() over a shared
preg_split_impl(). That leaves Preg::split()/split4() as bare
pass-throughs, so callers use the shim functions directly and the wrappers
are dropped along with the now-unreferenced PREG_SPLIT_* constants.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/downloader')
| -rw-r--r-- | crates/shirabe/src/downloader/fossil_downloader.rs | 4 | ||||
| -rw-r--r-- | crates/shirabe/src/downloader/git_downloader.rs | 6 | ||||
| -rw-r--r-- | crates/shirabe/src/downloader/svn_downloader.rs | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/crates/shirabe/src/downloader/fossil_downloader.rs b/crates/shirabe/src/downloader/fossil_downloader.rs index b5e3cb7c..cdc5f268 100644 --- a/crates/shirabe/src/downloader/fossil_downloader.rs +++ b/crates/shirabe/src/downloader/fossil_downloader.rs @@ -13,7 +13,7 @@ use crate::util::Filesystem; use crate::util::ProcessExecutor; use indexmap::IndexMap; use shirabe_pcre::Preg; -use shirabe_php_shim::{PhpMixed, RuntimeException, impl_php_class, php_regex}; +use shirabe_php_shim::{PhpMixed, RuntimeException, impl_php_class, php_regex, preg_split}; #[derive(Debug)] pub struct FossilDownloader { @@ -223,7 +223,7 @@ impl VcsDownloader for FossilDownloader { let lines: Vec<String> = if trimmed.is_empty() { vec![] } else { - Preg::split(php_regex!(r"{\r?\n}"), &trimmed) + preg_split(php_regex!(r"{\r?\n}"), &trimmed) }; for line in lines { diff --git a/crates/shirabe/src/downloader/git_downloader.rs b/crates/shirabe/src/downloader/git_downloader.rs index 7aeea252..90a962a2 100644 --- a/crates/shirabe/src/downloader/git_downloader.rs +++ b/crates/shirabe/src/downloader/git_downloader.rs @@ -20,8 +20,8 @@ use indexmap::IndexMap; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ CmpOp, PhpMixed, RuntimeException, array_map, basename, dirname, impl_php_class, implode, - in_array_strict, is_dir, php_regex, preg_quote, realpath, rtrim, strlen, strpos, substr, trim, - version_compare, + in_array_strict, is_dir, php_regex, preg_quote, preg_split, realpath, rtrim, strlen, strpos, + substr, trim, version_compare, }; #[derive(Debug)] @@ -1200,7 +1200,7 @@ impl VcsDownloader for GitDownloader { let changes: Vec<String> = array_map( |elem: &String| format!(" {}", elem), - &Preg::split(php_regex!(r"{\s*\r?\n\s*}"), &changes), + &preg_split(php_regex!(r"{\s*\r?\n\s*}"), &changes), ); self.inner.io.write_error3( &format!( diff --git a/crates/shirabe/src/downloader/svn_downloader.rs b/crates/shirabe/src/downloader/svn_downloader.rs index 1487a710..d5087d10 100644 --- a/crates/shirabe/src/downloader/svn_downloader.rs +++ b/crates/shirabe/src/downloader/svn_downloader.rs @@ -17,7 +17,8 @@ use crate::util::Svn as SvnUtil; use indexmap::IndexMap; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ - CmpOp, PhpMixed, RuntimeException, impl_php_class, is_dir, php_regex, version_compare, + CmpOp, PhpMixed, RuntimeException, impl_php_class, is_dir, php_regex, preg_split, + version_compare, }; #[derive(Debug)] @@ -271,7 +272,7 @@ impl VcsDownloader for SvnDownloader { } let changes_str = changes.unwrap(); - let changes: Vec<String> = Preg::split(php_regex!(r"{\s*\r?\n\s*}"), &changes_str) + let changes: Vec<String> = preg_split(php_regex!(r"{\s*\r?\n\s*}"), &changes_str) .into_iter() .map(|elem| format!(" {}", elem)) .collect(); |
