diff --git a/src/app.rs b/src/app.rs index aa1eaea..f8a3dbb 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1059,7 +1059,7 @@ impl TaskwarriorTui { } else if task .tags() .unwrap_or(&vec![]) - .contains(&tag_name.to_string().replace(".", "").to_uppercase()) + .contains(&tag_name.to_string().replace('.', "").to_uppercase()) { let color_tag_name = format!("color.{}", tag_name); let s = self.config.color.get(&color_tag_name).copied().unwrap_or_default(); @@ -1473,7 +1473,7 @@ impl TaskwarriorTui { std::cmp::min( self.current_selection .checked_add(self.task_report_height as usize) - .unwrap_or_else(|| self.tasks.len() - 1), + .unwrap_or(self.tasks.len() - 1), self.tasks.len() - 1, ) } diff --git a/src/config.rs b/src/config.rs index 214ea38..459d4a5 100644 --- a/src/config.rs +++ b/src/config.rs @@ -247,7 +247,7 @@ impl Config { } pub fn get_tcolor(line: &str) -> Style { - let (foreground, background) = line.split_at(line.to_lowercase().find("on ").unwrap_or_else(|| line.len())); + let (foreground, background) = line.split_at(line.to_lowercase().find("on ").unwrap_or(line.len())); let (mut foreground, mut background) = (String::from(foreground), String::from(background)); background = background.replace("on ", ""); let mut modifiers = Modifier::empty(); diff --git a/src/task_report.rs b/src/task_report.rs index 32d666f..fa2c753 100644 --- a/src/task_report.rs +++ b/src/task_report.rs @@ -18,14 +18,12 @@ pub fn format_date(dt: NaiveDateTime) -> String { pub fn vague_format_date_time(from_dt: NaiveDateTime, to_dt: NaiveDateTime) -> String { let mut seconds = (to_dt - from_dt).num_seconds(); - let minus: &str; - - if seconds < 0 { + let minus = if seconds < 0 { seconds *= -1; - minus = "-"; + "-" } else { - minus = ""; - } + "" + }; if seconds >= 60 * 60 * 24 * 365 { return format!("{}{}y", minus, seconds / 86400 / 365); @@ -175,11 +173,10 @@ impl TaskReportTable { pub fn simplify_table(&mut self) -> (Vec>, Vec) { // find which columns are empty - let null_columns_len; if self.tasks.is_empty() { return (vec![], vec![]); } - null_columns_len = self.tasks[0].len(); + let null_columns_len = self.tasks[0].len(); let mut null_columns = vec![0; null_columns_len]; for task in &self.tasks {