talexander/duster
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Rename the new functions to replace the old functions.

Browse Source
This commit is contained in:
Tom Alexander
2020-05-24 15:21:30 -04:00
parent 46fe1f5204
commit 39c579171b
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/renderer/walking.rs
View File

@@ -8,7 +8,7 @@ enum WalkResult<'a> {
FullyWalked(&'a dyn ContextElement),
}
fn walk_path_from_single_level_borrow<'a, P, C>(context: &'a C, path: &[P]) -> WalkResult<'a>
fn walk_path_from_single_level<'a, P, C>(context: &'a C, path: &[P]) -> WalkResult<'a>
where
P: Borrow<str>,
C: Borrow<dyn ContextElement + 'a>,
@@ -34,7 +34,7 @@ where
WalkResult::FullyWalked(output)
}
pub fn walk_path_combined<'a, B, P>(
pub fn walk_path<'a, B, P>(
breadcrumbs: &'a Vec<B>,
path: &Vec<P>,
) -> Result<&'a dyn ContextElement, WalkError>
@@ -54,7 +54,7 @@ where
.borrow()
== "."
{
return match walk_path_from_single_level_borrow(
return match walk_path_from_single_level(
breadcrumbs
.last()
.expect("Breadcrumbs should never be empty"),
@@ -68,7 +68,7 @@ where
};
}
for context in breadcrumbs.iter().rev() {
match walk_path_from_single_level_borrow(context, path) {
match walk_path_from_single_level(context, path) {
// If no walking was done at all, keep looping
WalkResult::NoWalk => {}
// If we partially walked then stop trying to find