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

matchers: make visit() return cloned sets instead of references

Browse source 
This is just to avoid the lifetime parameter. It was a premature
optimization to return a reference (we don't even use the matchers
yet, so it cloning these sets clearly doesn't show up in profiling).
This commit is contained in:
Martin von Zweigbergk 2021-05-19 21:27:53 -07:00
parent 3c787459dc
commit d49892431b
1 changed files with 27 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
lib/src/matchers.rs
View file

@ -19,21 +19,21 @@ use std::collections::{HashMap, HashSet};
use crate::repo_path::{RepoPath, RepoPathComponent}; use crate::repo_path::{RepoPath, RepoPathComponent};
#[derive(PartialEq, Eq, Debug)] #[derive(PartialEq, Eq, Debug)]
pub struct Visit<'matcher> { pub struct Visit {
pub dirs: VisitDirs<'matcher>, dirs: VisitDirs,
pub files: VisitFiles<'matcher>, files: VisitFiles,
} }
#[derive(PartialEq, Eq, Debug)] #[derive(PartialEq, Eq, Debug)]
pub enum VisitDirs<'matcher> { pub enum VisitDirs {
All, All,
Set(&'matcher HashSet<RepoPathComponent>), Set(HashSet<RepoPathComponent>),
} }
#[derive(PartialEq, Eq, Debug)] #[derive(PartialEq, Eq, Debug)]
pub enum VisitFiles<'matcher> { pub enum VisitFiles {
All, All,
Set(&'matcher HashSet<RepoPathComponent>), Set(HashSet<RepoPathComponent>),
} }
pub trait Matcher { pub trait Matcher {
@ -94,8 +94,6 @@ impl Matcher for FilesMatcher {
struct Dirs { struct Dirs {
dirs: HashMap<RepoPath, HashSet<RepoPathComponent>>, dirs: HashMap<RepoPath, HashSet<RepoPathComponent>>,
files: HashMap<RepoPath, HashSet<RepoPathComponent>>, files: HashMap<RepoPath, HashSet<RepoPathComponent>>,
empty_dirs: HashSet<RepoPathComponent>,
empty_files: HashSet<RepoPathComponent>,
} }
impl Dirs { impl Dirs {
@ -103,8 +101,6 @@ impl Dirs {
Dirs { Dirs {
dirs: HashMap::new(), dirs: HashMap::new(),
files: HashMap::new(), files: HashMap::new(),
empty_dirs: HashSet::new(),
empty_files: HashSet::new(),
} }
} }
@ -137,33 +133,31 @@ impl Dirs {
self.files.entry(dir).or_default().insert(basename.clone()); self.files.entry(dir).or_default().insert(basename.clone());
} }
fn get_dirs(&self, dir: &RepoPath) -> &HashSet<RepoPathComponent> { fn get_dirs(&self, dir: &RepoPath) -> HashSet<RepoPathComponent> {
self.dirs.get(dir).unwrap_or(&self.empty_dirs) self.dirs.get(dir).cloned().unwrap_or_default()
} }
fn get_files(&self, dir: &RepoPath) -> &HashSet<RepoPathComponent> { fn get_files(&self, dir: &RepoPath) -> HashSet<RepoPathComponent> {
self.files.get(dir).unwrap_or(&self.empty_files) self.files.get(dir).cloned().unwrap_or_default()
} }
} }
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use std::collections::HashSet;
use super::*; use super::*;
use crate::repo_path::{RepoPath, RepoPathComponent}; use crate::repo_path::{RepoPath, RepoPathComponent};
#[test] #[test]
fn dirs_empty() { fn dirs_empty() {
let dirs = Dirs::new(); let dirs = Dirs::new();
assert_eq!(dirs.get_dirs(&RepoPath::root()), &hashset! {}); assert_eq!(dirs.get_dirs(&RepoPath::root()), hashset! {});
} }
#[test] #[test]
fn dirs_root() { fn dirs_root() {
let mut dirs = Dirs::new(); let mut dirs = Dirs::new();
dirs.add_dir(RepoPath::root()); dirs.add_dir(RepoPath::root());
assert_eq!(dirs.get_dirs(&RepoPath::root()), &hashset! {}); assert_eq!(dirs.get_dirs(&RepoPath::root()), hashset! {});
} }
#[test] #[test]
@ -172,7 +166,7 @@ mod tests {
dirs.add_dir(RepoPath::from_internal_string("dir")); dirs.add_dir(RepoPath::from_internal_string("dir"));
assert_eq!( assert_eq!(
dirs.get_dirs(&RepoPath::root()), dirs.get_dirs(&RepoPath::root()),
&hashset! {RepoPathComponent::from("dir")} hashset! {RepoPathComponent::from("dir")}
); );
} }
@ -182,21 +176,21 @@ mod tests {
dirs.add_file(&RepoPath::from_internal_string("dir/file")); dirs.add_file(&RepoPath::from_internal_string("dir/file"));
assert_eq!( assert_eq!(
dirs.get_dirs(&RepoPath::root()), dirs.get_dirs(&RepoPath::root()),
&hashset! {RepoPathComponent::from("dir")} hashset! {RepoPathComponent::from("dir")}
); );
assert_eq!(dirs.get_files(&RepoPath::root()), &hashset! {}); assert_eq!(dirs.get_files(&RepoPath::root()), hashset! {});
} }
#[test] #[test]
fn filesmatcher_empty() { fn filesmatcher_empty() {
let m = FilesMatcher::new(HashSet::new()); let m = FilesMatcher::new(hashset! {});
assert!(!m.matches(&RepoPath::from_internal_string("file"))); assert!(!m.matches(&RepoPath::from_internal_string("file")));
assert!(!m.matches(&RepoPath::from_internal_string("dir/file"))); assert!(!m.matches(&RepoPath::from_internal_string("dir/file")));
assert_eq!( assert_eq!(
m.visit(&RepoPath::root()), m.visit(&RepoPath::root()),
Visit { Visit {
dirs: VisitDirs::Set(&HashSet::new()), dirs: VisitDirs::Set(hashset! {}),
files: VisitFiles::Set(&HashSet::new()), files: VisitFiles::Set(hashset! {}),
} }
); );
} }
@ -213,33 +207,33 @@ mod tests {
assert_eq!( assert_eq!(
m.visit(&RepoPath::root()), m.visit(&RepoPath::root()),
Visit { Visit {
dirs: VisitDirs::Set(&hashset! {RepoPathComponent::from("dir1")}), dirs: VisitDirs::Set(hashset! {RepoPathComponent::from("dir1")}),
files: VisitFiles::Set(&hashset! {RepoPathComponent::from("file4")}), files: VisitFiles::Set(hashset! {RepoPathComponent::from("file4")}),
} }
); );
assert_eq!( assert_eq!(
m.visit(&RepoPath::from_internal_string("dir1")), m.visit(&RepoPath::from_internal_string("dir1")),
Visit { Visit {
dirs: VisitDirs::Set( dirs: VisitDirs::Set(
&hashset! {RepoPathComponent::from("subdir1"), RepoPathComponent::from("subdir2")} hashset! {RepoPathComponent::from("subdir1"), RepoPathComponent::from("subdir2")}
), ),
files: VisitFiles::Set(&hashset! {}), files: VisitFiles::Set(hashset! {}),
} }
); );
assert_eq!( assert_eq!(
m.visit(&RepoPath::from_internal_string("dir1/subdir1")), m.visit(&RepoPath::from_internal_string("dir1/subdir1")),
Visit { Visit {
dirs: VisitDirs::Set(&hashset! {}), dirs: VisitDirs::Set(hashset! {}),
files: VisitFiles::Set( files: VisitFiles::Set(
&hashset! {RepoPathComponent::from("file1"), RepoPathComponent::from("file2")} hashset! {RepoPathComponent::from("file1"), RepoPathComponent::from("file2")}
), ),
} }
); );
assert_eq!( assert_eq!(
m.visit(&RepoPath::from_internal_string("dir1/subdir2")), m.visit(&RepoPath::from_internal_string("dir1/subdir2")),
Visit { Visit {
dirs: VisitDirs::Set(&hashset! {}), dirs: VisitDirs::Set(hashset! {}),
files: VisitFiles::Set(&hashset! {RepoPathComponent::from("file3")}), files: VisitFiles::Set(hashset! {RepoPathComponent::from("file3")}),
} }
); );
} }