diff options
Diffstat (limited to 'crates/shirabe/src/dependency_resolver')
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/lock_transaction.rs | 11 | ||||
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/pool_builder.rs | 8 | ||||
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/problem.rs | 10 |
3 files changed, 16 insertions, 13 deletions
diff --git a/crates/shirabe/src/dependency_resolver/lock_transaction.rs b/crates/shirabe/src/dependency_resolver/lock_transaction.rs index 71609658..a0004fd4 100644 --- a/crates/shirabe/src/dependency_resolver/lock_transaction.rs +++ b/crates/shirabe/src/dependency_resolver/lock_transaction.rs @@ -5,7 +5,7 @@ use crate::dependency_resolver::Pool; use crate::dependency_resolver::Transaction; use crate::package::PackageInterfaceHandle; use indexmap::IndexMap; -use shirabe_php_shim::{PregMatches, php_regex, preg_match, preg_replace_callback}; +use shirabe_php_shim::{PregMatches, php_regex, preg_is_match, preg_replace_callback}; #[derive(Debug)] pub struct LockTransaction { @@ -158,9 +158,12 @@ impl LockTransaction { if package.get_dist_url().is_some() && present_package.get_dist_reference().is_some() - && preg_match(php_regex!( - r"{^https?://(?:(?:www\.)?bitbucket\.org|(api\.)?github\.com|(?:www\.)?gitlab\.com)/}i" - ), &package.get_dist_url().unwrap()).is_some() + && preg_is_match( + php_regex!( + r"{^https?://(?:(?:www\.)?bitbucket\.org|(api\.)?github\.com|(?:www\.)?gitlab\.com)/}i" + ), + &package.get_dist_url().unwrap(), + ) { // Regex pattern compatibility: // The `regex` crate has no look-around, so `(?<=/|sha=)[a-f0-9]{40}(?=/|$)` is diff --git a/crates/shirabe/src/dependency_resolver/pool_builder.rs b/crates/shirabe/src/dependency_resolver/pool_builder.rs index 354a794c..98a0948d 100644 --- a/crates/shirabe/src/dependency_resolver/pool_builder.rs +++ b/crates/shirabe/src/dependency_resolver/pool_builder.rs @@ -21,7 +21,7 @@ use crate::repository::RootPackageRepository; use indexmap::IndexMap; use shirabe_php_shim::{ CmpOp, LogicException, PhpMixed, array_flip_strings, array_map, in_array_strict, microtime, - number_format, preg_match, round, strpos, + number_format, preg_is_match, round, strpos, }; use shirabe_semver::CompilingMatcher; use shirabe_semver::Intervals; @@ -785,7 +785,7 @@ impl PoolBuilder { fn is_update_allowed(&self, package: PackageInterfaceHandle) -> bool { for pattern in &self.update_allow_list { let pattern_regexp = base_package::package_name_to_regexp(pattern); - if preg_match(&pattern_regexp, &package.get_name()).is_some() { + if preg_is_match(&pattern_regexp, &package.get_name()) { return true; } } @@ -812,13 +812,13 @@ impl PoolBuilder { .borrow_mut() .get_packages()? { - if preg_match(&pattern_regexp, &package.get_name()).is_some() { + if preg_is_match(&pattern_regexp, &package.get_name()) { continue 'outer; } } // update pattern matches a root require? => all good, probably a new package for (package_name, _constraint) in request.get_requires() { - if preg_match(&pattern_regexp, package_name).is_some() { + if preg_is_match(&pattern_regexp, package_name) { if PlatformRepository::is_platform_package(package_name) { matched_platform_package = true; continue; diff --git a/crates/shirabe/src/dependency_resolver/problem.rs b/crates/shirabe/src/dependency_resolver/problem.rs index 6c1ae8c0..ba6f43bd 100644 --- a/crates/shirabe/src/dependency_resolver/problem.rs +++ b/crates/shirabe/src/dependency_resolver/problem.rs @@ -12,8 +12,8 @@ use crate::repository::RepositorySet; use indexmap::IndexMap; use shirabe_php_shim::{ CmpOp, LogicException, PhpMixed, extension_loaded, implode, loosely_compare, php_regex, - preg_match, preg_replace, spl_object_hash, sprintf, str_replace, stripos, strpos, strtolower, - substr, substr_count, version_compare, + preg_is_match, preg_match, preg_replace, spl_object_hash, sprintf, str_replace, stripos, + strpos, strtolower, substr, substr_count, version_compare, }; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::MultiConstraint; @@ -556,7 +556,7 @@ impl Problem { if let Some(c) = constraint && c.is_constraint() && c.get_operator() == Some(CmpOp::Eq) - && preg_match(php_regex!(r"{^dev-.*#.*}"), &c.get_pretty_string()).is_some() + && preg_is_match(php_regex!(r"{^dev-.*#.*}"), &c.get_pretty_string()) { let new_constraint = preg_replace( php_regex!(r"{ +as +([^,\s|]+)$}"), @@ -990,7 +990,7 @@ impl Problem { )); } - if preg_match(php_regex!(r"{^[A-Za-z0-9_./-]+$}"), package_name).is_none() { + if !preg_is_match(php_regex!(r"{^[A-Za-z0-9_./-]+$}"), package_name) { let illegal_chars = preg_replace(php_regex!(r"{[A-Za-z0-9_./-]+}"), "", package_name); return Ok(( @@ -1380,7 +1380,7 @@ impl Problem { && c.get_operator() == Some(CmpOp::Eq) && !c.get_version().starts_with("dev-") { - if preg_match(php_regex!(r"{^\d+(?:\.\d+)*$}"), &c.get_pretty_string()).is_none() { + if !preg_is_match(php_regex!(r"{^\d+(?:\.\d+)*$}"), &c.get_pretty_string()) { return format!(" {} (exact version match)", c.get_pretty_string()); } |