Fix clippy warnings

This commit is contained in:
Max Zhuravsky 2022-03-03 09:11:02 +03:00
parent 72867873df
commit d9424fd9c5
No known key found for this signature in database
GPG key ID: 2B6239B171404102
3 changed files with 8 additions and 11 deletions

View file

@ -1059,7 +1059,7 @@ impl TaskwarriorTui {
} else if task } else if task
.tags() .tags()
.unwrap_or(&vec![]) .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 color_tag_name = format!("color.{}", tag_name);
let s = self.config.color.get(&color_tag_name).copied().unwrap_or_default(); let s = self.config.color.get(&color_tag_name).copied().unwrap_or_default();
@ -1473,7 +1473,7 @@ impl TaskwarriorTui {
std::cmp::min( std::cmp::min(
self.current_selection self.current_selection
.checked_add(self.task_report_height as usize) .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, self.tasks.len() - 1,
) )
} }

View file

@ -247,7 +247,7 @@ impl Config {
} }
pub fn get_tcolor(line: &str) -> Style { 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)); let (mut foreground, mut background) = (String::from(foreground), String::from(background));
background = background.replace("on ", ""); background = background.replace("on ", "");
let mut modifiers = Modifier::empty(); let mut modifiers = Modifier::empty();

View file

@ -18,14 +18,12 @@ pub fn format_date(dt: NaiveDateTime) -> String {
pub fn vague_format_date_time(from_dt: NaiveDateTime, to_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 mut seconds = (to_dt - from_dt).num_seconds();
let minus: &str; let minus = if seconds < 0 {
if seconds < 0 {
seconds *= -1; seconds *= -1;
minus = "-"; "-"
} else { } else {
minus = ""; ""
} };
if seconds >= 60 * 60 * 24 * 365 { if seconds >= 60 * 60 * 24 * 365 {
return format!("{}{}y", minus, seconds / 86400 / 365); return format!("{}{}y", minus, seconds / 86400 / 365);
@ -175,11 +173,10 @@ impl TaskReportTable {
pub fn simplify_table(&mut self) -> (Vec<Vec<String>>, Vec<String>) { pub fn simplify_table(&mut self) -> (Vec<Vec<String>>, Vec<String>) {
// find which columns are empty // find which columns are empty
let null_columns_len;
if self.tasks.is_empty() { if self.tasks.is_empty() {
return (vec![], vec![]); 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]; let mut null_columns = vec![0; null_columns_len];
for task in &self.tasks { for task in &self.tasks {