aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/downloader/svn_downloader.rs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-18 01:57:02 +0900
committernsfisis <nsfisis@gmail.com>2026-08-18 01:57:02 +0900
commit530d085d4f3e19f94ac3cf8f8ac3b17000214b2e (patch)
treeb4de2c2443e2bb2cfc692454ac284dc1d2313e59 /crates/shirabe/src/downloader/svn_downloader.rs
parent0caac63bacefb9a1f62848636d47fca07f592bba (diff)
downloadphp-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.tar.gz
php-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.tar.zst
php-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.zip
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) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/downloader/svn_downloader.rs')
-rw-r--r--crates/shirabe/src/downloader/svn_downloader.rs27
1 files changed, 14 insertions, 13 deletions
diff --git a/crates/shirabe/src/downloader/svn_downloader.rs b/crates/shirabe/src/downloader/svn_downloader.rs
index 4931e539..a31e89c9 100644
--- a/crates/shirabe/src/downloader/svn_downloader.rs
+++ b/crates/shirabe/src/downloader/svn_downloader.rs
@@ -15,10 +15,9 @@ use crate::util::Filesystem;
use crate::util::ProcessExecutor;
use crate::util::Svn as SvnUtil;
use indexmap::IndexMap;
-use shirabe_pcre::Preg;
use shirabe_php_shim::{
- CmpOp, PhpMixed, RuntimeException, impl_php_class, is_dir, php_regex, preg_split,
- version_compare,
+ CmpOp, PhpMixed, RuntimeException, impl_php_class, is_dir, php_regex, preg_match2,
+ preg_replace, preg_split, version_compare,
};
#[derive(Debug)]
@@ -354,8 +353,8 @@ impl VcsDownloader for SvnDownloader {
to_reference: &str,
path: &str,
) -> anyhow::Result<String> {
- if Preg::is_match(php_regex!(r"{@(\d+)$}"), from_reference)
- && Preg::is_match(php_regex!(r"{@(\d+)$}"), to_reference)
+ if preg_match2(php_regex!(r"{@(\d+)$}"), from_reference, 0).is_some()
+ && preg_match2(php_regex!(r"{@(\d+)$}"), to_reference, 0).is_some()
{
// retrieve the svn base url from the checkout folder
let command = vec![
@@ -383,7 +382,7 @@ impl VcsDownloader for SvnDownloader {
}
let url_pattern = "#<url>(.*)</url>#";
- let base_url = if let Some(matches) = Preg::match3(url_pattern, &output) {
+ let base_url = if let Some(matches) = preg_match2(url_pattern, &output, 0) {
matches.get(1).unwrap_or_default().to_string()
} else {
return Err(RuntimeException::new(format!(
@@ -394,8 +393,8 @@ impl VcsDownloader for SvnDownloader {
};
// strip paths from references and only keep the actual revision
- let from_revision = Preg::replace(php_regex!(r"{.*@(\d+)$}"), "$1", from_reference);
- let to_revision = Preg::replace(php_regex!(r"{.*@(\d+)$}"), "$1", to_reference);
+ let from_revision = preg_replace(php_regex!(r"{.*@(\d+)$}"), "$1", from_reference);
+ let to_revision = preg_replace(php_regex!(r"{.*@(\d+)$}"), "$1", to_reference);
let command = vec![
"svn".to_string(),
@@ -453,11 +452,13 @@ impl ChangeReportInterface for SvnDownloader {
Some(path),
);
- Ok(if Preg::is_match(php_regex!("{^ *[^X ] +}m"), &output) {
- Some(output)
- } else {
- None
- })
+ Ok(
+ if preg_match2(php_regex!("{^ *[^X ] +}m"), &output, 0).is_some() {
+ Some(output)
+ } else {
+ None
+ },
+ )
}
}