aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-symfony-finder/src
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe-symfony-finder/src')
-rw-r--r--crates/shirabe-symfony-finder/src/finder.rs13
1 files changed, 6 insertions, 7 deletions
diff --git a/crates/shirabe-symfony-finder/src/finder.rs b/crates/shirabe-symfony-finder/src/finder.rs
index cc78ebe3..d3c76e3f 100644
--- a/crates/shirabe-symfony-finder/src/finder.rs
+++ b/crates/shirabe-symfony-finder/src/finder.rs
@@ -9,7 +9,7 @@
use crate::glob::Glob;
use chrono::{NaiveDate, NaiveDateTime};
use indexmap::IndexSet;
-use shirabe_pcre::{CaptureKey, Preg, PregMatchedGroups};
+use shirabe_pcre::{CaptureKey, Preg};
use shirabe_php_shim::{file_exists, glob, is_dir, php_regex, preg_quote, rtrim};
use std::path::{Path, PathBuf};
use std::time::UNIX_EPOCH;
@@ -642,13 +642,12 @@ fn is_regex(str: &str) -> bool {
// PHP 8.2+ available modifiers.
let available_modifiers = "imsxuADUn";
- let matches = PregMatchedGroups::new();
let pattern = format!("/^(.{{3,}}?)[{available_modifiers}]*$/");
if let Some(matches) = Preg::is_match3(&pattern, str) {
let group = matches
.get(&CaptureKey::ByIndex(1))
- .cloned()
- .unwrap_or_default();
+ .unwrap_or_default()
+ .to_string();
let bytes = group.as_bytes();
let start = bytes
.first()
@@ -694,13 +693,13 @@ fn parse_date_comparator(test: &str) -> (String, i64) {
let date = matches
.get(&CaptureKey::ByIndex(2))
- .cloned()
- .unwrap_or_default();
+ .unwrap_or_default()
+ .to_string();
let target = parse_datetime_to_unix(&date);
let mut operator = matches
.get(&CaptureKey::ByIndex(1))
- .cloned()
+ .map(str::to_string)
.unwrap_or_else(|| "==".to_string());
if operator == "since" || operator == "after" {
operator = ">".to_string();