From 34245e6f72d5effc569f010116960f8735936a73 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sat, 16 Jan 2021 21:14:55 +1000 Subject: [PATCH] use of 'self' in function name was confusing --- rslib/src/tags.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rslib/src/tags.rs b/rslib/src/tags.rs index 0120688ce..876b96f8e 100644 --- a/rslib/src/tags.rs +++ b/rslib/src/tags.rs @@ -104,7 +104,7 @@ fn immediate_parent_name(tag_name: UniCase<&str>) -> Option> { /// If the immediate parent is missing, check and add any missing parents. /// This should ensure that if an immediate parent is found, all ancestors /// are guaranteed to already exist. -fn add_self_and_missing_parents<'a, 'b>( +fn add_tag_and_missing_parents<'a, 'b>( all: &'a mut HashSet>, missing: &'a mut Vec>, tag_name: UniCase<&'b str>, @@ -112,10 +112,10 @@ fn add_self_and_missing_parents<'a, 'b>( if let Some(parent) = immediate_parent_name(tag_name) { if !all.contains(&parent) { missing.push(parent); - add_self_and_missing_parents(all, missing, parent); + add_tag_and_missing_parents(all, missing, parent); } } - // finally, add self + // finally, add provided tag all.insert(tag_name); } @@ -124,7 +124,7 @@ fn add_missing_parents(tags: &mut Vec) { let mut all_names: HashSet> = HashSet::new(); let mut missing = vec![]; for tag in &*tags { - add_self_and_missing_parents(&mut all_names, &mut missing, UniCase::new(&tag.name)) + add_tag_and_missing_parents(&mut all_names, &mut missing, UniCase::new(&tag.name)) } let mut missing: Vec<_> = missing .into_iter()