From 1dd9039c4611795ad8eb41d553cc811fcd6ee364 Mon Sep 17 00:00:00 2001 From: Takeshi Tsukamoto Date: Wed, 24 Apr 2024 23:26:53 +0900 Subject: [PATCH] Clippy fix --- src/components/inspector.rs | 10 ++++++++-- src/widgets/tree.rs | 16 +++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/components/inspector.rs b/src/components/inspector.rs index 577a7d3..899416c 100644 --- a/src/components/inspector.rs +++ b/src/components/inspector.rs @@ -23,12 +23,18 @@ pub struct InspectorComponent { action_tx: Option>, } -impl<'a> InspectorComponent { +impl Default for InspectorComponent { + fn default() -> Self { + Self::new() + } +} + +impl InspectorComponent { pub fn new() -> Self { Self { action_tx: None } } - fn item_builder(item: &DiagnosticNode) -> Node<'a> { + fn item_builder(item: &DiagnosticNode) -> Node { if let Some(children) = item.children.as_ref() { let children = children.iter().map(Self::item_builder).collect(); Node::new( diff --git a/src/widgets/tree.rs b/src/widgets/tree.rs index e501aa5..ed3eac7 100644 --- a/src/widgets/tree.rs +++ b/src/widgets/tree.rs @@ -8,6 +8,12 @@ pub struct TreeState { pub opened: HashSet, } +impl Default for TreeState { + fn default() -> Self { + Self::new() + } +} + impl TreeState { pub fn new() -> Self { TreeState { @@ -111,10 +117,10 @@ impl<'a> Tree<'a> { pub fn make_lines( node: &Node<'a>, state: &TreeState, - prefix_for_root: &Vec>, - prefix_for_children: &Vec>, + prefix_for_root: &[Span<'a>], + prefix_for_children: &[Span<'a>], ) -> Vec<(String, Line<'a>)> { - let mut root_item: Vec = prefix_for_root.clone(); + let mut root_item: Vec = prefix_for_root.to_vec(); if node.children.is_empty() { root_item.push(Span::raw("─")); @@ -133,13 +139,13 @@ impl<'a> Tree<'a> { if state.opened.contains(&node.id) { for (i, child) in node.children.iter().enumerate() { - let mut child_prefix_for_root = prefix_for_children.clone(); + let mut child_prefix_for_root = prefix_for_children.to_vec(); if i == node.children.len().wrapping_sub(1) { child_prefix_for_root.push(Span::raw("╰")); } else { child_prefix_for_root.push(Span::raw("├")); } - let mut child_prefix_for_children = prefix_for_children.clone(); + let mut child_prefix_for_children = prefix_for_children.to_vec(); if i != node.children.len().wrapping_sub(1) { child_prefix_for_children.push(Span::raw("│")); } else {