aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/package/version
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
commitfed0a6e7ac361af9b963c1f62411b1a85478230c (patch)
tree5cde64a24845c761890fbcbe05e0d702f1ec8df7 /crates/shirabe/src/package/version
parente093b2be1c333e67c96aebb0a5291bea9ae3d6db (diff)
downloadphp-shirabe-fed0a6e7ac361af9b963c1f62411b1a85478230c.tar.gz
php-shirabe-fed0a6e7ac361af9b963c1f62411b1a85478230c.tar.zst
php-shirabe-fed0a6e7ac361af9b963c1f62411b1a85478230c.zip
refactor(preg): add preg_is_match for existence-only call sites
The capture groups were discarded at 162 of the preg_match call sites, which only tested the Option. They now call preg_is_match, which lets the regex engine skip capture tracking. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/package/version')
-rw-r--r--crates/shirabe/src/package/version/version_bumper.rs4
-rw-r--r--crates/shirabe/src/package/version/version_guesser.rs23
-rw-r--r--crates/shirabe/src/package/version/version_parser.rs5
-rw-r--r--crates/shirabe/src/package/version/version_selector.rs6
4 files changed, 20 insertions, 18 deletions
diff --git a/crates/shirabe/src/package/version/version_bumper.rs b/crates/shirabe/src/package/version/version_bumper.rs
index e75dea33..075663d4 100644
--- a/crates/shirabe/src/package/version/version_bumper.rs
+++ b/crates/shirabe/src/package/version/version_bumper.rs
@@ -6,7 +6,7 @@ use crate::package::loader::ArrayLoader;
use crate::package::version::VersionParser;
use crate::util::Platform;
use shirabe_php_shim::{
- CaptureKey, php_regex, preg_match, preg_match_all_offset_capture, preg_replace,
+ CaptureKey, php_regex, preg_is_match, preg_match_all_offset_capture, preg_replace,
};
use shirabe_semver::Intervals;
use shirabe_semver::constraint::AnyConstraint;
@@ -51,7 +51,7 @@ impl VersionBumper {
preg_replace(php_regex!(r"{(?:\.(?:0|9999999))+(-dev)?$}"), "", &version);
let new_pretty_constraint = format!("^{}", version_without_suffix);
- if preg_match(php_regex!(r"{^\^\d+(\.\d+)*$}"), &new_pretty_constraint).is_none() {
+ if !preg_is_match(php_regex!(r"{^\^\d+(\.\d+)*$}"), &new_pretty_constraint) {
return Ok(pretty_constraint);
}
diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs
index 668fce02..3c47d5b2 100644
--- a/crates/shirabe/src/package/version/version_guesser.rs
+++ b/crates/shirabe/src/package/version/version_guesser.rs
@@ -14,8 +14,8 @@ use crate::util::sync_executor;
use indexmap::IndexMap;
use shirabe_php_shim::{
PhpMixed, RuntimeException, array_keys, array_map, array_merge, empty, function_exists,
- implode, is_string, json_encode, php_regex, preg_match, preg_quote, preg_replace, str_replace,
- strlen, strnatcasecmp, strpos, substr, trim, usort,
+ implode, is_string, json_encode, php_regex, preg_is_match, preg_match, preg_quote,
+ preg_replace, str_replace, strlen, strnatcasecmp, strpos, substr, trim, usort,
};
/// Seam over the parts of [`VersionGuesser`] that consumers depend on, so they can be exercised
@@ -156,11 +156,10 @@ impl VersionGuesser {
}
if "-dev" == substr(version_data.version.as_deref().unwrap_or(""), -4, None)
- && preg_match(
+ && preg_is_match(
php_regex!(r"{\.9{7}}"),
version_data.version.as_deref().unwrap_or(""),
)
- .is_some()
{
version_data.pretty_version = Some(preg_replace(
php_regex!(r"{(\.9{7})+}"),
@@ -181,11 +180,10 @@ impl VersionGuesser {
-4,
None,
)
- && preg_match(
+ && preg_is_match(
php_regex!(r"{\.9{7}}"),
version_data.feature_version.as_deref().unwrap_or(""),
)
- .is_some()
{
version_data.feature_pretty_version = Some(preg_replace(
php_regex!(r"{(\.9{7})+}"),
@@ -257,7 +255,7 @@ impl VersionGuesser {
}
if !branch.is_empty()
- && preg_match(php_regex!(r"{^ *.+/HEAD }"), &branch).is_none()
+ && !preg_is_match(php_regex!(r"{^ *.+/HEAD }"), &branch)
&& let Some(m) = preg_match(
php_regex!(
r"{^(?:\* )? *((?:remotes/(?:origin|upstream)/)?[^\s/]+) *([a-f0-9]+) .*$}"
@@ -608,10 +606,13 @@ impl VersionGuesser {
non_feature_branches = implode("|", &names);
}
- preg_match(format!(
- r"{{^({}|master|main|latest|next|current|support|tip|trunk|default|develop|\d+\..+)$}}",
- non_feature_branches,
- ), branch_name.unwrap_or("")).is_none()
+ !preg_is_match(
+ format!(
+ r"{{^({}|master|main|latest|next|current|support|tip|trunk|default|develop|\d+\..+)$}}",
+ non_feature_branches,
+ ),
+ branch_name.unwrap_or(""),
+ )
}
fn guess_fossil_version(&mut self, path: &str) -> anyhow::Result<VersionData> {
diff --git a/crates/shirabe/src/package/version/version_parser.rs b/crates/shirabe/src/package/version/version_parser.rs
index 6e7c5825..906e99f9 100644
--- a/crates/shirabe/src/package/version/version_parser.rs
+++ b/crates/shirabe/src/package/version/version_parser.rs
@@ -2,7 +2,7 @@
use crate::repository::PlatformRepository;
use indexmap::IndexMap;
-use shirabe_php_shim::{php_regex, preg_match, preg_replace};
+use shirabe_php_shim::{php_regex, preg_is_match, preg_replace};
use shirabe_semver::Semver;
use shirabe_semver::VersionParser as SemverVersionParser;
use shirabe_semver::constraint::AnyConstraint;
@@ -57,11 +57,10 @@ impl VersionParser {
if !pair.contains(' ')
&& i + 1 < count
&& !pairs[i + 1].contains('/')
- && preg_match(
+ && !preg_is_match(
php_regex!(r"{(?<=[a-z0-9_/-])\*|\*(?=[a-z0-9_/-])}i"),
&pairs[i + 1],
)
- .is_none()
&& !PlatformRepository::is_platform_package(&pairs[i + 1])
{
pair += &format!(" {}", pairs[i + 1]);
diff --git a/crates/shirabe/src/package/version/version_selector.rs b/crates/shirabe/src/package/version/version_selector.rs
index 91929c40..61435870 100644
--- a/crates/shirabe/src/package/version/version_selector.rs
+++ b/crates/shirabe/src/package/version/version_selector.rs
@@ -16,7 +16,9 @@ use crate::repository::PlatformRepository;
use crate::repository::RepositoryInterface;
use crate::repository::RepositorySetInterface;
use indexmap::IndexMap;
-use shirabe_php_shim::{CmpOp, php_regex, preg_match, preg_replace, strtolower, version_compare};
+use shirabe_php_shim::{
+ CmpOp, php_regex, preg_is_match, preg_replace, strtolower, version_compare,
+};
use shirabe_semver::constraint::AnyConstraint;
use shirabe_semver::constraint::SimpleConstraint;
@@ -302,7 +304,7 @@ impl VersionSelector {
let semantic_version_parts: Vec<&str> = version.split('.').collect();
if semantic_version_parts.len() == 4
- && preg_match(php_regex!(r"{^\d+\D?}"), semantic_version_parts[3]).is_some()
+ && preg_is_match(php_regex!(r"{^\d+\D?}"), semantic_version_parts[3])
{
let mut parts: Vec<String> = semantic_version_parts
.iter()