From 6d0f235165239a78566f775271bd7bafb55b5cef Mon Sep 17 00:00:00 2001 From: Ben Date: Wed, 24 Apr 2024 13:24:19 +0200 Subject: [PATCH] fmt fixes --- examples/all.rs | 5 +---- examples/multi_spinner.rs | 2 +- src/menu/input.rs | 2 +- src/spinner/mod.rs | 4 +--- src/terminal.rs | 14 +++++++------- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/examples/all.rs b/examples/all.rs index e689d8e..3b5523e 100644 --- a/examples/all.rs +++ b/examples/all.rs @@ -48,10 +48,7 @@ fn main() { Frames::short_loading_bar_with_arrow(), "short_loading_bar_with_arrow" ); - test_predefined_animation!( - Frames::loading_bar_with_arrow(), - "loading_bar_with_arrow" - ); + test_predefined_animation!(Frames::loading_bar_with_arrow(), "loading_bar_with_arrow"); test_predefined_animation!(Frames::speaker(), "speaker"); test_predefined_animation!(Frames::finger_dance(), "finger_dance"); test_predefined_animation!(Frames::fist_bump(), "fist_bump"); diff --git a/examples/multi_spinner.rs b/examples/multi_spinner.rs index 3ef9c54..e764a70 100644 --- a/examples/multi_spinner.rs +++ b/examples/multi_spinner.rs @@ -46,7 +46,7 @@ fn main() { sleep(Duration::from_secs(2)); spinner.set_text(&spinner1, "spinner1 stopped".to_string()); spinner.stop(&spinner1); - + spinner.show_line_number(); sleep(Duration::from_secs(9)); diff --git a/src/menu/input.rs b/src/menu/input.rs index 8f672ac..155ac1d 100644 --- a/src/menu/input.rs +++ b/src/menu/input.rs @@ -17,7 +17,7 @@ use std::path::Path; use crossterm::{ cursor, execute, - terminal::{Clear, ClearType, disable_raw_mode, enable_raw_mode}, + terminal::{disable_raw_mode, enable_raw_mode, Clear, ClearType}, }; use regex::Regex; diff --git a/src/spinner/mod.rs b/src/spinner/mod.rs index d6b45c0..ac52319 100644 --- a/src/spinner/mod.rs +++ b/src/spinner/mod.rs @@ -23,12 +23,11 @@ use std::sync::{Arc, Mutex}; use std::thread; use std::time::Duration; - pub use frames::*; use crate::iterators::balanced_iterator; -use crate::style::{Attribute, Color, ContentStyle,StyledString}; use crate::style; +use crate::style::{Attribute, Color, ContentStyle, StyledString}; use crate::terminal::{console_cursor, console_render}; pub mod frames; @@ -308,7 +307,6 @@ impl MultiSpinner { console_render::push_unstyled_spaces!(combined_vec, 1); } - // always include spinner text combined_vec.push(spinner.text.clone()); diff --git a/src/terminal.rs b/src/terminal.rs index 50d143c..63953a0 100644 --- a/src/terminal.rs +++ b/src/terminal.rs @@ -32,16 +32,16 @@ pub(crate) mod console_render { } macro_rules! push_unstyled_spaces { - ($vec:expr, $count:expr) => {{ - for _ in 0..$count { - $vec.push(StyledString::new(" ")); - } - }}; -} + ($vec:expr, $count:expr) => {{ + for _ in 0..$count { + $vec.push(StyledString::new(" ")); + } + }}; + } pub(crate) use push_styled_string; - pub(crate) use raw_mode_wrapper; pub(crate) use push_unstyled_spaces; + pub(crate) use raw_mode_wrapper; pub fn render_line(frame: &Vec, row: u16) { let mut stdout = stdout();