From 959b60de32f3f7534e0fb263205b6464fa635847 Mon Sep 17 00:00:00 2001 From: Alex Clarke Date: Fri, 15 Nov 2024 12:50:14 -0700 Subject: [PATCH] style: Applied formatting to all files --- benches/bench.rs | 35 ++++++++++++++++------------------- examples/example.rs | 43 ++++++++++++++++++++----------------------- src/flatten.rs | 30 ++++++++++++++++++++++++++---- src/lib.rs | 8 ++++---- src/tree_item.rs | 15 ++++++--------- src/tree_state.rs | 9 +++------ 6 files changed, 75 insertions(+), 65 deletions(-) diff --git a/benches/bench.rs b/benches/bench.rs index ce6660e..e93d392 100644 --- a/benches/bench.rs +++ b/benches/bench.rs @@ -1,36 +1,33 @@ use std::hint::black_box; use criterion::{criterion_group, criterion_main, BatchSize, Criterion, Throughput}; +use managarr_tree_widget::{Tree, TreeItem, TreeState}; use ratatui::buffer::Buffer; use ratatui::layout::Rect; use ratatui::widgets::StatefulWidget; -use managarr_tree_widget::{Tree, TreeItem, TreeState}; #[must_use] fn example_items() -> Vec> { vec![ - TreeItem::new_leaf( "Alfa"), + TreeItem::new_leaf("Alfa"), TreeItem::new( "Bravo", vec![ - TreeItem::new_leaf( "Charlie"), + TreeItem::new_leaf("Charlie"), TreeItem::new( "Delta", - vec![ - TreeItem::new_leaf( "Echo"), - TreeItem::new_leaf( "Foxtrot"), - ], + vec![TreeItem::new_leaf("Echo"), TreeItem::new_leaf("Foxtrot")], ) .expect("all item identifiers are unique"), - TreeItem::new_leaf( "Golf"), + TreeItem::new_leaf("Golf"), ], ) .expect("all item identifiers are unique"), - TreeItem::new_leaf( "Hotel"), + TreeItem::new_leaf("Hotel"), TreeItem::new( "India", vec![ - TreeItem::new_leaf( "Juliet"), + TreeItem::new_leaf("Juliet"), TreeItem::new_leaf("Kilo"), TreeItem::new_leaf("Lima"), TreeItem::new_leaf("Mike"), @@ -38,28 +35,28 @@ fn example_items() -> Vec> { ], ) .expect("all item identifiers are unique"), - TreeItem::new_leaf( "Oscar"), + TreeItem::new_leaf("Oscar"), TreeItem::new( "Papa", vec![ - TreeItem::new_leaf( "Quebec"), - TreeItem::new_leaf( "Romeo"), - TreeItem::new_leaf( "Sierra"), - TreeItem::new_leaf( "Tango"), - TreeItem::new_leaf( "Uniform"), + TreeItem::new_leaf("Quebec"), + TreeItem::new_leaf("Romeo"), + TreeItem::new_leaf("Sierra"), + TreeItem::new_leaf("Tango"), + TreeItem::new_leaf("Uniform"), TreeItem::new( "Victor", vec![ TreeItem::new_leaf("Whiskey"), - TreeItem::new_leaf ("Xray"), - TreeItem::new_leaf( "Yankee"), + TreeItem::new_leaf("Xray"), + TreeItem::new_leaf("Yankee"), ], ) .expect("all item identifiers are unique"), ], ) .expect("all item identifiers are unique"), - TreeItem::new_leaf( "Zulu"), + TreeItem::new_leaf("Zulu"), ] } diff --git a/examples/example.rs b/examples/example.rs index 2218a7c..c5ea71d 100644 --- a/examples/example.rs +++ b/examples/example.rs @@ -1,5 +1,6 @@ use std::time::{Duration, Instant}; +use managarr_tree_widget::{Tree, TreeItem, TreeState}; use ratatui::backend::{Backend, CrosstermBackend}; use ratatui::crossterm::event::{Event, KeyCode, KeyModifiers, MouseEventKind}; use ratatui::layout::{Position, Rect}; @@ -7,7 +8,6 @@ use ratatui::style::{Color, Modifier, Style}; use ratatui::text::Span; use ratatui::widgets::{Block, Scrollbar, ScrollbarOrientation}; use ratatui::{crossterm, Frame, Terminal}; -use managarr_tree_widget::{Tree, TreeItem, TreeState}; #[must_use] struct App { @@ -20,20 +20,17 @@ impl App { Self { state: TreeState::default(), items: vec![ - TreeItem::new_leaf( "Alfa"), + TreeItem::new_leaf("Alfa"), TreeItem::new( "Bravo", vec![ - TreeItem::new_leaf( "Charlie"), + TreeItem::new_leaf("Charlie"), TreeItem::new( "Delta", - vec![ - TreeItem::new_leaf("Echo"), - TreeItem::new_leaf( "Foxtrot"), - ], + vec![TreeItem::new_leaf("Echo"), TreeItem::new_leaf("Foxtrot")], ) .expect("all item identifiers are unique"), - TreeItem::new_leaf( "Golf"), + TreeItem::new_leaf("Golf"), ], ) .expect("all item identifiers are unique"), @@ -41,36 +38,36 @@ impl App { TreeItem::new( "India", vec![ - TreeItem::new_leaf( "Juliet"), - TreeItem::new_leaf( "Kilo"), - TreeItem::new_leaf( "Lima"), - TreeItem::new_leaf( "Mike"), - TreeItem::new_leaf( "November"), + TreeItem::new_leaf("Juliet"), + TreeItem::new_leaf("Kilo"), + TreeItem::new_leaf("Lima"), + TreeItem::new_leaf("Mike"), + TreeItem::new_leaf("November"), ], ) .expect("all item identifiers are unique"), - TreeItem::new_leaf( "Oscar"), + TreeItem::new_leaf("Oscar"), TreeItem::new( "Papa", vec![ - TreeItem::new_leaf( "Quebec"), - TreeItem::new_leaf( "Romeo"), - TreeItem::new_leaf( "Sierra"), - TreeItem::new_leaf( "Tango"), - TreeItem::new_leaf( "Uniform"), + TreeItem::new_leaf("Quebec"), + TreeItem::new_leaf("Romeo"), + TreeItem::new_leaf("Sierra"), + TreeItem::new_leaf("Tango"), + TreeItem::new_leaf("Uniform"), TreeItem::new( "Victor", vec![ - TreeItem::new_leaf( "Whiskey"), - TreeItem::new_leaf( "Xray"), - TreeItem::new_leaf( "Yankee"), + TreeItem::new_leaf("Whiskey"), + TreeItem::new_leaf("Xray"), + TreeItem::new_leaf("Yankee"), ], ) .expect("all item identifiers are unique"), ], ) .expect("all item identifiers are unique"), - TreeItem::new_leaf( "Zulu"), + TreeItem::new_leaf("Zulu"), ], } } diff --git a/src/flatten.rs b/src/flatten.rs index 2f99aba..1a93a62 100644 --- a/src/flatten.rs +++ b/src/flatten.rs @@ -1,8 +1,8 @@ +use crate::tree_item::TreeItem; +use ratatui::text::ToText; use std::collections::HashSet; use std::fmt::Display; use std::hash::Hash; -use crate::tree_item::TreeItem; -use ratatui::text::ToText; /// A flattened item of all visible [`TreeItem`]s. /// @@ -125,7 +125,17 @@ fn flatten_one_is_open() { hasher.finish() }; open.insert(vec![hash("Bravo")]); - flatten_works(&open, &[hash("Alfa"), hash("Bravo"), hash("Charlie"), hash("Delta"), hash("Golf"), hash("Hotel")]); + flatten_works( + &open, + &[ + hash("Alfa"), + hash("Bravo"), + hash("Charlie"), + hash("Delta"), + hash("Golf"), + hash("Hotel"), + ], + ); } #[test] @@ -139,5 +149,17 @@ fn flatten_all_open() { }; open.insert(vec![hash("Bravo")]); open.insert(vec![hash("Bravo"), hash("Delta")]); - flatten_works(&open, &[hash("Alfa"), hash("Bravo"), hash("Charlie"), hash("Delta"), hash("Echo"), hash("Foxtrot"), hash("Golf"), hash("Hotel")]); + flatten_works( + &open, + &[ + hash("Alfa"), + hash("Bravo"), + hash("Charlie"), + hash("Delta"), + hash("Echo"), + hash("Foxtrot"), + hash("Golf"), + hash("Hotel"), + ], + ); } diff --git a/src/lib.rs b/src/lib.rs index edecc73..23c0b2e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,14 +5,14 @@ Tree widget [`Tree`] is generated with [`TreeItem`]s (which itself can contain [ The user interaction state (like the current selection) is stored in the [`TreeState`]. */ -use std::collections::HashSet; -use std::fmt::Display; -use std::hash::Hash; use ratatui::buffer::Buffer; use ratatui::layout::Rect; use ratatui::style::Style; use ratatui::text::ToText; use ratatui::widgets::{Block, Scrollbar, ScrollbarState, StatefulWidget, Widget}; +use std::collections::HashSet; +use std::fmt::Display; +use std::hash::Hash; use unicode_width::UnicodeWidthStr; pub use crate::flatten::Flattened; @@ -346,8 +346,8 @@ where #[cfg(test)] mod render_tests { - use std::hash::{DefaultHasher, Hasher}; use super::*; + use std::hash::{DefaultHasher, Hasher}; #[must_use] #[track_caller] diff --git a/src/tree_item.rs b/src/tree_item.rs index 4d7ee1a..52aa6b4 100644 --- a/src/tree_item.rs +++ b/src/tree_item.rs @@ -1,7 +1,7 @@ +use ratatui::text::ToText; use std::collections::HashSet; use std::fmt::Display; use std::hash::{DefaultHasher, Hash, Hasher}; -use ratatui::text::ToText; /// One item inside a [`Tree`](crate::Tree). /// @@ -80,7 +80,7 @@ where pub fn new_leaf(content: T) -> Self { let mut hasher = DefaultHasher::new(); content.hash(&mut hasher); - + Self { identifier: hasher.finish(), content, @@ -159,17 +159,14 @@ impl TreeItem<&'static str> { Self::new_leaf("Charlie"), Self::new( "Delta", - vec![ - Self::new_leaf("Echo"), - Self::new_leaf( "Foxtrot"), - ], + vec![Self::new_leaf("Echo"), Self::new_leaf("Foxtrot")], ) .expect("all item identifiers are unique"), Self::new_leaf("Golf"), ], ) .expect("all item identifiers are unique"), - Self::new_leaf( "Hotel"), + Self::new_leaf("Hotel"), ] } } @@ -177,7 +174,7 @@ impl TreeItem<&'static str> { #[test] #[should_panic = "duplicate identifiers"] fn tree_item_new_errors_with_duplicate_identifiers() { - let item = TreeItem::new_leaf( "text"); + let item = TreeItem::new_leaf("text"); let another = item.clone(); TreeItem::new("Root", vec![item, another]).unwrap(); } @@ -187,6 +184,6 @@ fn tree_item_new_errors_with_duplicate_identifiers() { fn tree_item_add_child_errors_with_duplicate_identifiers() { let item = TreeItem::new_leaf("text"); let another = item.clone(); - let mut root = TreeItem::new( "Root", vec![item]).unwrap(); + let mut root = TreeItem::new("Root", vec![item]).unwrap(); root.add_child(another).unwrap(); } diff --git a/src/tree_state.rs b/src/tree_state.rs index 0bb27b5..f8e0d09 100644 --- a/src/tree_state.rs +++ b/src/tree_state.rs @@ -1,8 +1,8 @@ +use ratatui::layout::{Position, Rect}; +use ratatui::text::ToText; use std::collections::HashSet; use std::fmt::Display; use std::hash::Hash; -use ratatui::layout::{Position, Rect}; -use ratatui::text::ToText; use crate::flatten::{flatten, Flattened}; use crate::tree_item::TreeItem; @@ -56,10 +56,7 @@ impl TreeState { /// Get a flat list of all currently viewable (including by scrolling) [`TreeItem`]s with this `TreeState`. #[must_use] - pub fn flatten<'a, T>( - &self, - items: &'a [TreeItem], - ) -> Vec> + pub fn flatten<'a, T>(&self, items: &'a [TreeItem]) -> Vec> where T: ToText + Clone + Default + Display + Hash, {