mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-26 14:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

matchers: simply derive Default for RepoPathTree

Browse source 
Perhaps, I didn't do that because it's important to initialize is_dir/file to
false. Since I'm going to extract a generic map-like API, and is_dir/file will
be an enum, this won't be a problem.
This commit is contained in:
Yuya Nishihara 2024-04-15 16:49:14 +09:00
parent f92e5b911f
commit 8e196d0025
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/src/matchers.rs
View file

@ -127,7 +127,7 @@ pub struct FilesMatcher {
impl FilesMatcher { impl FilesMatcher {
pub fn new(files: impl IntoIterator<Item = impl AsRef<RepoPath>>) -> Self { pub fn new(files: impl IntoIterator<Item = impl AsRef<RepoPath>>) -> Self {
let mut tree = RepoPathTree::new(); let mut tree = RepoPathTree::default();
for f in files { for f in files {
tree.add(f.as_ref()).is_file = true; tree.add(f.as_ref()).is_file = true;
} }
@ -153,7 +153,7 @@ pub struct PrefixMatcher {
impl PrefixMatcher { impl PrefixMatcher {
#[instrument(skip(prefixes))] #[instrument(skip(prefixes))]
pub fn new(prefixes: impl IntoIterator<Item = impl AsRef<RepoPath>>) -> Self { pub fn new(prefixes: impl IntoIterator<Item = impl AsRef<RepoPath>>) -> Self {
let mut tree = RepoPathTree::new(); let mut tree = RepoPathTree::default();
for prefix in prefixes { for prefix in prefixes {
let sub = tree.add(prefix.as_ref()); let sub = tree.add(prefix.as_ref());
sub.is_dir = true; sub.is_dir = true;
@ -340,7 +340,7 @@ impl<M1: Matcher, M2: Matcher> Matcher for IntersectionMatcher<M1, M2> {
/// Keeps track of which subdirectories and files of each directory need to be /// Keeps track of which subdirectories and files of each directory need to be
/// visited. /// visited.
#[derive(PartialEq, Eq)] #[derive(Default, PartialEq, Eq)]
struct RepoPathTree { struct RepoPathTree {
entries: HashMap<RepoPathComponentBuf, RepoPathTree>, entries: HashMap<RepoPathComponentBuf, RepoPathTree>,
// is_dir/is_file aren't exclusive, both can be set to true. If entries is not empty, // is_dir/is_file aren't exclusive, both can be set to true. If entries is not empty,
@ -350,20 +350,12 @@ struct RepoPathTree {
} }
impl RepoPathTree { impl RepoPathTree {
fn new() -> Self {
RepoPathTree {
entries: HashMap::new(),
is_dir: false,
is_file: false,
}
}
fn add(&mut self, dir: &RepoPath) -> &mut RepoPathTree { fn add(&mut self, dir: &RepoPath) -> &mut RepoPathTree {
dir.components().fold(self, |sub, name| { dir.components().fold(self, |sub, name| {
// Avoid name.clone() if entry already exists. // Avoid name.clone() if entry already exists.
if !sub.entries.contains_key(name) { if !sub.entries.contains_key(name) {
sub.is_dir = true; sub.is_dir = true;
sub.entries.insert(name.to_owned(), RepoPathTree::new()); sub.entries.insert(name.to_owned(), Self::default());
} }
sub.entries.get_mut(name).unwrap() sub.entries.get_mut(name).unwrap()
}) })