From 1b5fbc0d05cbcb1d5b45470298fe7006a8498587 Mon Sep 17 00:00:00 2001 From: Sam Tay Date: Tue, 7 Jul 2020 18:52:28 -0700 Subject: Obey clippy --- src/config.rs | 2 +- src/term.rs | 21 ++++++++------------- src/tui/views.rs | 1 - 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/config.rs b/src/config.rs index 1a22bb0..49209f6 100644 --- a/src/config.rs +++ b/src/config.rs @@ -96,7 +96,7 @@ pub fn theme_file_name() -> Result { let name = project_dir()?.config_dir().join("colors.toml"); if !name.as_path().exists() { let mut file = utils::create_file(&name)?; - file.write_all(include_str!("../themes/default.toml").as_bytes())?; + file.write_all(include_bytes!("../themes/default.toml"))?; } Ok(name) } diff --git a/src/term.rs b/src/term.rs index fab35f5..9ce9e53 100644 --- a/src/term.rs +++ b/src/term.rs @@ -78,19 +78,14 @@ pub fn spinner() -> (Sender<()>, JoinHandle>) { terminal::Clear(ClearType::CurrentLine), )?; let mut interval = time::interval(time::Duration::from_millis(LOADING_SPINNER_DELAY)); - loop { - match rx.try_recv() { - Err(TryRecvError::Empty) => { - execute!( - stderr(), - cursor::MoveToColumn(0), - terminal::Clear(ClearType::CurrentLine), - Print(dots.next().unwrap()) - )?; - interval.tick().await; - } - _ => break, - } + while let Err(TryRecvError::Empty) = rx.try_recv() { + execute!( + stderr(), + cursor::MoveToColumn(0), + terminal::Clear(ClearType::CurrentLine), + Print(dots.next().unwrap()) + )?; + interval.tick().await; } execute!( stderr(), diff --git a/src/tui/views.rs b/src/tui/views.rs index a7d3885..d7c7af9 100644 --- a/src/tui/views.rs +++ b/src/tui/views.rs @@ -12,7 +12,6 @@ use std::fmt::Display; use std::rc::Rc; use super::markdown::Markdown; -use crate::error::Result; pub const NAME_QUESTION_LIST: &str = "question_list"; pub const NAME_ANSWER_LIST: &str = "answer_list"; -- cgit v1.2.3