bootandy/archived-dust
1
0
Fork 0
mirror of https://github.com/bootandy/dust.git synced 2026-06-08 11:29:05 +03:00
Code Issues 21 Packages Projects Releases 10 Wiki Activity

refactor: simplify filter.rs

Browse Source
This commit is contained in:
andy.boot
2023-01-29 10:08:53 +00:00
parent 6db013a601
commit 5a3e15d0ce
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/filter.rs
+7 -7
View File
@@ -39,14 +39,14 @@ pub fn get_biggest(top_level_nodes: Vec<Node>, display_data: AggregateData) -> O
heap = add_children(&display_data, &root, heap); heap = add_children(&display_data, &root, heap);
} }
fill_remaining_lines(heap, &root, display_data) Some(fill_remaining_lines(heap, &root, display_data))
} }
pub fn fill_remaining_lines<'a>( pub fn fill_remaining_lines<'a>(
mut heap: BinaryHeap<&'a Node>, mut heap: BinaryHeap<&'a Node>,
root: &'a Node, root: &'a Node,
display_data: AggregateData, display_data: AggregateData,
) -> Option<DisplayNode> { ) -> DisplayNode {
let mut allowed_nodes = HashMap::new(); let mut allowed_nodes = HashMap::new();
while allowed_nodes.len() < display_data.number_of_lines { while allowed_nodes.len() < display_data.number_of_lines {
@@ -109,19 +109,19 @@ fn always_add_children<'a>(
fn recursive_rebuilder( fn recursive_rebuilder(
allowed_nodes: &HashMap<&Path, &Node>, allowed_nodes: &HashMap<&Path, &Node>,
current: &Node, current: &Node,
) -> Option<DisplayNode> { ) -> DisplayNode {
let new_children: Vec<_> = current let new_children: Vec<_> = current
.children .children
.iter() .iter()
.filter(|c| allowed_nodes.contains_key(c.name.as_path())) .filter(|c| allowed_nodes.contains_key(c.name.as_path()))
.filter_map(|c| recursive_rebuilder(allowed_nodes, c)) .map(|c| recursive_rebuilder(allowed_nodes, c))
.collect(); .collect();
Some(build_node(new_children, current)) build_node(new_children, current)
} }
// Applies all allowed nodes as children to current node // Applies all allowed nodes as children to current node
fn flat_rebuilder(allowed_nodes: HashMap<&Path, &Node>, current: &Node) -> Option<DisplayNode> { fn flat_rebuilder(allowed_nodes: HashMap<&Path, &Node>, current: &Node) -> DisplayNode {
let new_children: Vec<DisplayNode> = allowed_nodes let new_children: Vec<DisplayNode> = allowed_nodes
.into_values() .into_values()
.map(|v| DisplayNode { .map(|v| DisplayNode {
@@ -130,7 +130,7 @@ fn flat_rebuilder(allowed_nodes: HashMap<&Path, &Node>, current: &Node) -> Optio
children: vec![], children: vec![],
}) })
.collect::<Vec<DisplayNode>>(); .collect::<Vec<DisplayNode>>();
Some(build_node(new_children, current)) build_node(new_children, current)
} }
fn build_node(mut new_children: Vec<DisplayNode>, current: &Node) -> DisplayNode { fn build_node(mut new_children: Vec<DisplayNode>, current: &Node) -> DisplayNode {