aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crates/shirabe-pcre/src/preg.rs13
-rw-r--r--crates/shirabe-php-shim/src/preg.rs23
-rw-r--r--crates/shirabe-symfony-process/src/process.rs2
-rw-r--r--crates/shirabe/src/command/remove_command.rs21
-rw-r--r--crates/shirabe/src/console/application.rs14
-rw-r--r--crates/shirabe/src/repository/composer_repository.rs11
6 files changed, 38 insertions, 46 deletions
diff --git a/crates/shirabe-pcre/src/preg.rs b/crates/shirabe-pcre/src/preg.rs
index 0ebc0ff2..e197c874 100644
--- a/crates/shirabe-pcre/src/preg.rs
+++ b/crates/shirabe-pcre/src/preg.rs
@@ -15,7 +15,7 @@ use indexmap::IndexMap;
pub use shirabe_php_shim::CaptureKey;
use shirabe_php_shim::{
PREG_OFFSET_CAPTURE, PREG_SET_ORDER, PREG_SPLIT_OFFSET_CAPTURE, PREG_UNMATCHED_AS_NULL,
- PregPattern, preg_grep2, preg_match_all_offset_capture2, preg_match_all2, preg_match2,
+ PregPattern, preg_grep, preg_match_all_offset_capture2, preg_match_all2, preg_match2,
preg_replace_callback, preg_replace2, preg_split2,
};
@@ -180,12 +180,11 @@ impl Preg {
preg_split2(pattern, subject, limit, flags)
}
- pub fn grep(pattern: impl PregPattern, array: &[&str]) -> Vec<String> {
- Self::grep3(pattern, array, 0)
- }
-
- pub fn grep3(pattern: impl PregPattern, array: &[&str], flags: i64) -> Vec<String> {
- preg_grep2(pattern, array, flags)
+ pub fn grep<T: AsRef<str>>(
+ pattern: impl PregPattern,
+ array: impl IntoIterator<Item = T>,
+ ) -> impl Iterator<Item = T> {
+ preg_grep(pattern, array)
}
pub fn is_match(pattern: impl PregPattern, subject: &str) -> bool {
diff --git a/crates/shirabe-php-shim/src/preg.rs b/crates/shirabe-php-shim/src/preg.rs
index 637e969d..727fc149 100644
--- a/crates/shirabe-php-shim/src/preg.rs
+++ b/crates/shirabe-php-shim/src/preg.rs
@@ -8,7 +8,6 @@ pub const PREG_UNMATCHED_AS_NULL: i64 = 512;
pub const PREG_SPLIT_NO_EMPTY: i64 = 1;
pub const PREG_SPLIT_DELIM_CAPTURE: i64 = 2;
pub const PREG_SPLIT_OFFSET_CAPTURE: i64 = 4;
-pub const PREG_GREP_INVERT: i64 = 1;
#[derive(Debug, Clone, PartialOrd, Ord, PartialEq, Eq, Hash)]
pub enum CaptureKey {
@@ -242,21 +241,15 @@ pub fn preg_match_all_offset_capture2(
count
}
-pub fn preg_grep(pattern: impl PregPattern, input: &[String]) -> Vec<String> {
- let __resolved = pattern.resolve();
- let (re, _anchored) = __resolved.parts();
- input.iter().filter(|s| re.is_match(s)).cloned().collect()
-}
-
-pub fn preg_grep2(pattern: impl PregPattern, array: &[&str], flags: i64) -> Vec<String> {
+pub fn preg_grep<T: AsRef<str>>(
+ pattern: impl PregPattern,
+ array: impl IntoIterator<Item = T>,
+) -> impl Iterator<Item = T> {
let __resolved = pattern.resolve();
- let (re, _anchored) = __resolved.parts();
- let invert = flags & PREG_GREP_INVERT != 0;
- array
- .iter()
- .filter(|s| re.is_match(s) != invert)
- .map(|s| s.to_string())
- .collect()
+ array.into_iter().filter(move |s| {
+ let (re, _anchored) = __resolved.parts();
+ re.is_match(s.as_ref())
+ })
}
pub fn preg_split(pattern: impl PregPattern, subject: &str) -> Vec<String> {
diff --git a/crates/shirabe-symfony-process/src/process.rs b/crates/shirabe-symfony-process/src/process.rs
index 5307e1ae..045224c5 100644
--- a/crates/shirabe-symfony-process/src/process.rs
+++ b/crates/shirabe-symfony-process/src/process.rs
@@ -988,7 +988,7 @@ impl Process {
.map(|spec| {
format!(
"\"{}\"",
- preg_replace(php_regex!(r#"{(\\*+)"}"#), "$1$1\\\"", &spec,)
+ preg_replace(php_regex!(r#"{(\\*+)"}"#), "$1$1\\\"", &spec)
)
})
})
diff --git a/crates/shirabe/src/command/remove_command.rs b/crates/shirabe/src/command/remove_command.rs
index a8b525e6..bba0285f 100644
--- a/crates/shirabe/src/command/remove_command.rs
+++ b/crates/shirabe/src/command/remove_command.rs
@@ -393,11 +393,11 @@ impl Command for RemoveCommand {
.and_then(|v| v.as_array())
.map(|m| m.keys().cloned().collect())
.unwrap_or_default();
- let type_keys_refs: Vec<&str> = type_keys.iter().map(|s| s.as_str()).collect();
- let matches_in_type = Preg::grep(
+ let matches_in_type: Vec<&String> = Preg::grep(
base_package::package_name_to_regexp(package),
- &type_keys_refs,
- );
+ type_keys.iter(),
+ )
+ .collect();
let alt_type_keys: Vec<String> = composer_data
.as_array()
@@ -405,15 +405,14 @@ impl Command for RemoveCommand {
.and_then(|v| v.as_array())
.map(|m| m.keys().cloned().collect())
.unwrap_or_default();
- let alt_type_keys_refs: Vec<&str> =
- alt_type_keys.iter().map(|s| s.as_str()).collect();
- let matches_in_alt_type = Preg::grep(
+ let matches_in_alt_type: Vec<&String> = Preg::grep(
base_package::package_name_to_regexp(package),
- &alt_type_keys_refs,
- );
+ alt_type_keys.iter(),
+ )
+ .collect();
if !type_keys.is_empty() && !matches_in_type.is_empty() {
- for matched_package in &matches_in_type {
+ for matched_package in matches_in_type {
if dry_run {
to_remove
.entry(r#type.to_string())
@@ -424,7 +423,7 @@ impl Command for RemoveCommand {
}
}
} else if !alt_type_keys.is_empty() && !matches_in_alt_type.is_empty() {
- for matched_package in &matches_in_alt_type {
+ for matched_package in matches_in_alt_type {
io.write_error(&format!(
"<warning>{} could not be found in {} but it is present in {}</warning>",
matched_package, r#type, alt_type
diff --git a/crates/shirabe/src/console/application.rs b/crates/shirabe/src/console/application.rs
index 9033700b..b55b9e68 100644
--- a/crates/shirabe/src/console/application.rs
+++ b/crates/shirabe/src/console/application.rs
@@ -953,7 +953,8 @@ impl Application {
.map(|p| preg_quote(&p, None))
.collect();
let expr = format!("{}{}", shirabe_php_shim::implode("[^:]*:", &parts), "[^:]*");
- let namespaces = preg_grep(format!("{{^{}}}", expr), &all_namespaces);
+ let namespaces: Vec<String> =
+ preg_grep(format!("{{^{}}}", expr), all_namespaces.iter().cloned()).collect();
if namespaces.is_empty() {
let mut message = format!(
@@ -1049,14 +1050,19 @@ impl Application {
.map(|p| preg_quote(&p, None))
.collect();
let expr = format!("{}{}", shirabe_php_shim::implode("[^:]*:", &parts), "[^:]*");
- let mut commands = preg_grep(format!("{{^{}}}", expr), &all_commands);
+ let mut commands: Vec<String> =
+ preg_grep(format!("{{^{}}}", expr), all_commands.iter().cloned()).collect();
if commands.is_empty() {
- commands = preg_grep(format!("{{^{}}}i", expr), &all_commands);
+ commands = preg_grep(format!("{{^{}}}i", expr), all_commands.iter().cloned()).collect();
}
// if no commands matched or we just matched namespaces
- if commands.is_empty() || preg_grep(format!("{{^{}$}}i", expr), &commands).is_empty() {
+ if commands.is_empty()
+ || preg_grep(format!("{{^{}$}}i", expr), commands.iter())
+ .next()
+ .is_none()
+ {
if let Some(pos) = shirabe_php_shim::strrpos(name, ":") {
// check if a namespace exists and contains commands
self.find_namespace(&name[..pos])?;
diff --git a/crates/shirabe/src/repository/composer_repository.rs b/crates/shirabe/src/repository/composer_repository.rs
index 2faf33dc..ab8572ad 100644
--- a/crates/shirabe/src/repository/composer_repository.rs
+++ b/crates/shirabe/src/repository/composer_repository.rs
@@ -430,10 +430,7 @@ impl ComposerRepository {
};
let filter_results = |results: Vec<String>| -> anyhow::Result<Vec<String>> {
match &package_filter_regex {
- Some(regex) => {
- let results_refs: Vec<&str> = results.iter().map(|s| s.as_str()).collect();
- Ok(Preg::grep(regex, &results_refs))
- }
+ Some(regex) => Ok(Preg::grep(regex, results).collect()),
None => Ok(results),
}
};
@@ -771,8 +768,7 @@ impl ComposerRepository {
let regex = format!("{{(?:{})}}i", parts.join("|"));
let vendor_names = self.get_vendor_names()?;
- let vendor_names_refs: Vec<&str> = vendor_names.iter().map(|s| s.as_str()).collect();
- for name in Preg::grep(&regex, &vendor_names_refs) {
+ for name in Preg::grep(&regex, vendor_names) {
let mut entry = IndexMap::new();
entry.insert("name".to_string(), PhpMixed::String(name));
entry.insert("description".to_string(), PhpMixed::String(String::new()));
@@ -836,8 +832,7 @@ impl ComposerRepository {
let regex = format!("{{(?:{})}}i", parts.join("|"));
let package_names = self.get_package_names(None)?;
- let package_names_refs: Vec<&str> = package_names.iter().map(|s| s.as_str()).collect();
- for name in Preg::grep(&regex, &package_names_refs) {
+ for name in Preg::grep(&regex, package_names) {
let mut entry = IndexMap::new();
entry.insert("name".to_string(), PhpMixed::String(name));
entry.insert("description".to_string(), PhpMixed::String(String::new()));
generated by cgit v1.3.1-4-g156e (git 2.54.0) at 2026-09-21 07:21:12 +0000