diff --git a/examples/example.rs b/examples/example.rs index fbcc3e0..05dde17 100644 --- a/examples/example.rs +++ b/examples/example.rs @@ -9,12 +9,12 @@ use ratatui::widgets::{Block, Scrollbar, ScrollbarOrientation}; use ratatui::{Frame, Terminal}; use tui_tree_widget::{Tree, TreeItem, TreeState}; -struct App<'a> { +struct App { state: TreeState<&'static str>, - items: Vec>, + items: Vec>, } -impl<'a> App<'a> { +impl App { fn new() -> Self { Self { state: TreeState::default(), diff --git a/src/flatten.rs b/src/flatten.rs index 35e705e..4d671e8 100644 --- a/src/flatten.rs +++ b/src/flatten.rs @@ -5,12 +5,12 @@ use crate::tree_item::TreeItem; /// A flattened item of all visible [`TreeItem`]s. /// /// Generated via [`TreeState::flatten`](crate::TreeState::flatten). -pub struct Flattened<'a, Identifier> { +pub struct Flattened<'text, Identifier> { pub identifier: Vec, - pub item: &'a TreeItem<'a, Identifier>, + pub item: &'text TreeItem<'text, Identifier>, } -impl<'a, Identifier> Flattened<'a, Identifier> { +impl Flattened<'_, Identifier> { /// Zero based depth. Depth 0 means 0 indentation. #[must_use] pub fn depth(&self) -> usize { @@ -22,11 +22,11 @@ impl<'a, Identifier> Flattened<'a, Identifier> { /// /// `current` starts empty: `&[]` #[must_use] -pub fn flatten<'a, Identifier>( +pub fn flatten<'text, Identifier>( opened: &HashSet>, - items: &'a [TreeItem<'a, Identifier>], + items: &'text [TreeItem<'text, Identifier>], current: &[Identifier], -) -> Vec> +) -> Vec> where Identifier: Clone + PartialEq + Eq + core::hash::Hash, { diff --git a/src/lib.rs b/src/lib.rs index 9ed7e75..7c4aeb9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -169,7 +169,7 @@ fn tree_new_errors_with_duplicate_identifiers() { Tree::new(vec![item, another]).unwrap(); } -impl<'a, Identifier> StatefulWidget for Tree<'a, Identifier> +impl StatefulWidget for Tree<'_, Identifier> where Identifier: Clone + PartialEq + Eq + core::hash::Hash, { @@ -332,7 +332,7 @@ where } } -impl<'a, Identifier> Widget for Tree<'a, Identifier> +impl Widget for Tree<'_, Identifier> where Identifier: Clone + Default + Eq + core::hash::Hash, { diff --git a/src/tree_item.rs b/src/tree_item.rs index ac929f1..d97e565 100644 --- a/src/tree_item.rs +++ b/src/tree_item.rs @@ -34,13 +34,13 @@ use ratatui::text::Text; /// # Ok::<(), std::io::Error>(()) /// ``` #[derive(Debug, Clone)] -pub struct TreeItem<'a, Identifier> { +pub struct TreeItem<'text, Identifier> { pub(super) identifier: Identifier, - pub(super) text: Text<'a>, + pub(super) text: Text<'text>, pub(super) children: Vec, } -impl<'a, Identifier> TreeItem<'a, Identifier> +impl<'text, Identifier> TreeItem<'text, Identifier> where Identifier: Clone + PartialEq + Eq + core::hash::Hash, { @@ -48,7 +48,7 @@ where #[must_use] pub fn new_leaf(identifier: Identifier, text: T) -> Self where - T: Into>, + T: Into>, { Self { identifier, @@ -64,7 +64,7 @@ where /// Errors when there are duplicate identifiers in the children. pub fn new(identifier: Identifier, text: T, children: Vec) -> std::io::Result where - T: Into>, + T: Into>, { let identifiers = children .iter()