Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixup poor utility naming

Browse source
This commit is contained in:
Kay Simmons 2023-02-25 14:12:25 -08:00
parent 36f3d3d738
commit cdc6566d87
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/fuzzy/src/paths.rs
View file

@ -159,9 +159,14 @@ pub async fn match_path_sets<'a, Set: PathMatchCandidateSet<'a>>(
positions: Vec::new(), positions: Vec::new(),
path: candidate.path.clone(), path: candidate.path.clone(),
path_prefix: candidate_set.prefix(), path_prefix: candidate_set.prefix(),
distance_to_relative_ancestor: distance_to_relative_ancestor( distance_to_relative_ancestor: relative_to.as_ref().map_or(
candidate.path.as_ref(), usize::MAX,
&relative_to, |relative_to| {
distance_between_paths(
candidate.path.as_ref(),
relative_to.as_ref(),
)
},
), ),
}, },
); );
@ -189,11 +194,7 @@ pub async fn match_path_sets<'a, Set: PathMatchCandidateSet<'a>>(
/// Compute the distance from a given path to some other path /// Compute the distance from a given path to some other path
/// If there is no shared path, returns usize::MAX /// If there is no shared path, returns usize::MAX
fn distance_to_relative_ancestor(path: &Path, relative_to: &Option<Arc<Path>>) -> usize { fn distance_between_paths(path: &Path, relative_to: &Path) -> usize {
let Some(relative_to) = relative_to else {
return usize::MAX;
};
let mut path_components = path.components(); let mut path_components = path.components();
let mut relative_components = relative_to.components(); let mut relative_components = relative_to.components();