ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

matchers: remove redundant files set from FilesMatcher, use Dirs

Browse source
This commit is contained in:
Yuya Nishihara 2022-12-28 15:02:10 +09:00
parent 2fb0363c03
commit c7eaee3d86
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/src/matchers.rs
View file

@ -97,7 +97,6 @@ impl Matcher for EverythingMatcher {
#[derive(PartialEq, Eq, Debug)] #[derive(PartialEq, Eq, Debug)]
pub struct FilesMatcher { pub struct FilesMatcher {
files: HashSet<RepoPath>,
dirs: Dirs, dirs: Dirs,
} }
@ -107,13 +106,13 @@ impl FilesMatcher {
for f in &files { for f in &files {
dirs.add_file(f); dirs.add_file(f);
} }
FilesMatcher { files, dirs } FilesMatcher { dirs }
} }
} }
impl Matcher for FilesMatcher { impl Matcher for FilesMatcher {
fn matches(&self, file: &RepoPath) -> bool { fn matches(&self, file: &RepoPath) -> bool {
self.files.contains(file) self.dirs.get(file).map(|sub| sub.is_file).unwrap_or(false)
} }
fn visit(&self, dir: &RepoPath) -> Visit { fn visit(&self, dir: &RepoPath) -> Visit {
@ -401,6 +400,12 @@ mod tests {
RepoPath::from_internal_string("file4"), RepoPath::from_internal_string("file4"),
}); });
assert!(!m.matches(&RepoPath::from_internal_string("dir1")));
assert!(!m.matches(&RepoPath::from_internal_string("dir1/subdir1")));
assert!(m.matches(&RepoPath::from_internal_string("dir1/subdir1/file1")));
assert!(m.matches(&RepoPath::from_internal_string("dir1/subdir1/file2")));
assert!(!m.matches(&RepoPath::from_internal_string("dir1/subdir1/file3")));
assert_eq!( assert_eq!(
m.visit(&RepoPath::root()), m.visit(&RepoPath::root()),
Visit::sets( Visit::sets(