diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-18 01:57:02 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-18 01:57:02 +0900 |
| commit | e093b2be1c333e67c96aebb0a5291bea9ae3d6db (patch) | |
| tree | 0743fad689f419959c3a898605e21485087884fa /crates/shirabe-symfony-finder/src | |
| parent | 050c56ef263d90d862ef565bc1762909110e02eb (diff) | |
| download | php-shirabe-e093b2be1c333e67c96aebb0a5291bea9ae3d6db.tar.gz php-shirabe-e093b2be1c333e67c96aebb0a5291bea9ae3d6db.tar.zst php-shirabe-e093b2be1c333e67c96aebb0a5291bea9ae3d6db.zip | |
refactor(preg): drop the offset argument from preg_match
Every call site but one passed offset 0. The remaining one, the UTF-8
chunking loop in Application, slices the subject instead: its pattern has
no anchor or lookaround, so matching a suffix is equivalent to starting
the search at that offset.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe-symfony-finder/src')
| -rw-r--r-- | crates/shirabe-symfony-finder/src/finder.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crates/shirabe-symfony-finder/src/finder.rs b/crates/shirabe-symfony-finder/src/finder.rs index 5befed2d..b32418db 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_php_shim::{file_exists, glob, is_dir, php_regex, preg_match2, preg_quote, rtrim}; +use shirabe_php_shim::{file_exists, glob, is_dir, php_regex, preg_match, preg_quote, rtrim}; use std::path::{Path, PathBuf}; use std::time::UNIX_EPOCH; @@ -310,7 +310,7 @@ impl Finder { let dir = rtrim(dir, Some("/")); - if preg_match2(php_regex!("#^(ssh2\\.)?s?ftp://#"), &dir, 0).is_some() { + if preg_match(php_regex!("#^(ssh2\\.)?s?ftp://#"), &dir).is_some() { format!("{dir}/") } else { dir @@ -591,7 +591,7 @@ fn exclude_accept( }; let path = path.replace('\\', "/"); - return preg_match2(pattern, &path, 0).is_none(); + return preg_match(pattern, &path).is_none(); } true @@ -618,14 +618,14 @@ fn to_regex_path(pattern: &str) -> String { /// `MultiplePcreFilterIterator::isAccepted`. fn is_accepted(string: &str, match_regexps: &[String], nomatch_regexps: &[String]) -> bool { for regex in nomatch_regexps { - if preg_match2(regex, string, 0).is_some() { + if preg_match(regex, string).is_some() { return false; } } if !match_regexps.is_empty() { for regex in match_regexps { - if preg_match2(regex, string, 0).is_some() { + if preg_match(regex, string).is_some() { return true; } } @@ -642,7 +642,7 @@ fn is_regex(str: &str) -> bool { let available_modifiers = "imsxuADUn"; let pattern = format!("/^(.{{3,}}?)[{available_modifiers}]*$/"); - if let Some(matches) = preg_match2(&pattern, str, 0) { + if let Some(matches) = preg_match(&pattern, str) { let group = matches.get(1).unwrap_or_default().to_string(); let bytes = group.as_bytes(); let start = bytes @@ -655,7 +655,7 @@ fn is_regex(str: &str) -> bool { .unwrap_or_default(); if start == end { - return preg_match2(php_regex!("/[*?[:alnum:] \\\\]/"), &start, 0).is_none(); + return preg_match(php_regex!("/[*?[:alnum:] \\\\]/"), &start).is_none(); } for (open, close) in [("{", "}"), ("(", ")"), ("[", "]"), ("<", ">")] { @@ -683,7 +683,7 @@ fn comparator_test(operator: &str, test: i64, target: i64) -> bool { /// `DateComparator::__construct`, returning `(operator, target unix timestamp)`. fn parse_date_comparator(test: &str) -> (String, i64) { let pattern = "#^\\s*(==|!=|[<>]=?|after|since|before|until)?\\s*(.+?)\\s*$#i"; - let Some(matches) = preg_match2(pattern, test, 0) else { + let Some(matches) = preg_match(pattern, test) else { panic!("Don't understand \"{test}\" as a date test."); }; |
