proxmox-mirrors/pathpatterns
1
0
Fork 0
mirror of https://git.proxmox.com/git/pathpatterns synced 2026-01-28 01:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pattern: drop unused component slice parameter

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2020-07-09 14:24:07 +02:00
parent 37c4c9b20f
commit f9fbdc3b94
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pattern.rs
View File

@ -396,14 +396,16 @@ impl Pattern {
/// Check whether this pattern matches a text.
pub fn matches<T: AsRef<[u8]>>(&self, text: T) -> bool {
match self.do_matches(&self.components, 0, text.as_ref()) {
match self.do_matches(0, text.as_ref()) {
MatchResult::Match => true,
_ => false,
}
}
// The algorithm is ported from git's wildmatch.c.
fn do_matches(&self, components: &[Component], mut ci: usize, mut text: &[u8]) -> MatchResult {
fn do_matches(&self, mut ci: usize, mut text: &[u8]) -> MatchResult {
let components = &self.components[..];
if self.flags.intersects(PatternFlag::PATH_NAME) {
// If we match a path then we want the pattern `"foo"` to match the path `"/foo"`.
}
@ -472,7 +474,7 @@ impl Pattern {
// FIXME: Optimization: Add the "try to advance faster" optimization from
// git here.
match self.do_matches(components, ci + 1, text) {
match self.do_matches(ci + 1, text) {
MatchResult::NoMatch => {
if text[0] == b'/' {
return MatchResult::AbortToStarStar;
@ -490,8 +492,7 @@ impl Pattern {
}
if let Component::StarStar = components[ci] {
if ci > 0
&& components[ci - 1].ends_with_slash()
if ((ci > 0 && components[ci - 1].ends_with_slash()) || ci == 0)
&& ((ci + 1) == components.len()
|| components[ci + 1].starts_with_slash())
{
@ -505,7 +506,7 @@ impl Pattern {
std::slice::from_raw_parts(text.as_ptr().offset(-1), text.len() + 1)
};
#[allow(clippy::single_match)]
match self.do_matches(components, ci + 1, text) {
match self.do_matches(ci + 1, text) {
MatchResult::Match => return MatchResult::Match,
_ => (), // or just continue regularly
}
@ -518,7 +519,7 @@ impl Pattern {
return MatchResult::AbortAll;
}
match self.do_matches(components, ci + 1, text) {
match self.do_matches(ci + 1, text) {
MatchResult::NoMatch => (),
MatchResult::AbortToStarStar => (), // continue from here
other => return other,