Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

globset: add matches_all method #2900

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 66 additions & 14 deletions crates/globset/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,27 @@ impl GlobSet {
false
}

/// Returns true if ALL globs in this set match the path given.
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need to use caps for ALL here. Just "all" is fine.

pub fn matches_all<P: AsRef<Path>>(&self, path: P) -> bool {
self.matches_all_candidate(&Candidate::new(path.as_ref()))
}

/// Returns ture if all globs in this set match the path given.
///
/// This takes a Candidate as input, which can be used to amortize the
/// cost of peparing a path for matching.
///
/// This will return true if the set of globs is empty, as in that case all `0` of
/// the globs will match.
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please wrap lines to 79 columns (inclusive).

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, this note should be added to matches_all too.

pub fn matches_all_candidate(&self, path: &Candidate<'_>) -> bool {
for strat in &self.strats {
if !strat.is_match(path) {
return false;
}
}
true
}

/// Returns the sequence number of every glob pattern that matches the
/// given path.
pub fn matches<P: AsRef<Path>>(&self, path: P) -> Vec<usize> {
Expand Down Expand Up @@ -461,20 +482,33 @@ impl GlobSet {
required_exts.0.len(),
regexes.literals.len()
);
Ok(GlobSet {
len: pats.len(),
strats: vec![
GlobSetMatchStrategy::Extension(exts),
GlobSetMatchStrategy::BasenameLiteral(base_lits),
GlobSetMatchStrategy::Literal(lits),
GlobSetMatchStrategy::Suffix(suffixes.suffix()),
GlobSetMatchStrategy::Prefix(prefixes.prefix()),
GlobSetMatchStrategy::RequiredExtension(
required_exts.build()?,
),
GlobSetMatchStrategy::Regex(regexes.regex_set()?),
],
})
let mut strats = Vec::with_capacity(7);
// Only add strategies that are populated
if !exts.0.is_empty() {
strats.push(GlobSetMatchStrategy::Extension(exts));
}
if !base_lits.0.is_empty() {
strats.push(GlobSetMatchStrategy::BasenameLiteral(base_lits));
}
if !lits.0.is_empty() {
strats.push(GlobSetMatchStrategy::Literal(lits));
}
if !suffixes.is_empty() {
strats.push(GlobSetMatchStrategy::Suffix(suffixes.suffix()));
}
if !prefixes.is_empty() {
strats.push(GlobSetMatchStrategy::Prefix(prefixes.prefix()));
}
if !required_exts.0.is_empty() {
strats.push(GlobSetMatchStrategy::RequiredExtension(
required_exts.build()?,
));
}
if !regexes.is_empty() {
strats.push(GlobSetMatchStrategy::Regex(regexes.regex_set()?));
}

Ok(GlobSet { len: pats.len(), strats })
}
}

Expand Down Expand Up @@ -892,6 +926,10 @@ impl MultiStrategyBuilder {
patset: Arc::new(Pool::new(create)),
})
}

fn is_empty(&self) -> bool {
self.literals.is_empty()
}
}

#[derive(Clone, Debug)]
Expand Down Expand Up @@ -979,6 +1017,7 @@ mod tests {
let set = GlobSetBuilder::new().build().unwrap();
assert!(!set.is_match(""));
assert!(!set.is_match("a"));
assert!(set.matches_all("a"));
}

#[test]
Expand Down Expand Up @@ -1019,4 +1058,17 @@ mod tests {
let matches = set.matches("nada");
assert_eq!(0, matches.len());
}

#[test]
fn matches_all_works() {
let mut builder = GlobSetBuilder::new();
builder.add(Glob::new("src/*").unwrap());
builder.add(Glob::new("**/*.rs").unwrap());
let set = builder.build().unwrap();

println!("matches={:?}", set.matches("src/foo.rs"));
assert!(set.matches_all("src/foo.rs"));
assert!(!set.matches_all("src/bar.c"));
assert!(!set.matches_all("test.rs"));
}
}