Run cargo clippy

This commit is contained in:
Dheepak Krishnamurthy 2020-10-12 03:55:58 -06:00
parent fa86430395
commit e5c4c5c702
3 changed files with 79 additions and 87 deletions

View file

@ -81,27 +81,25 @@ pub fn get_color(s: &str) -> Color {
let green = (s.as_bytes()[4] as char).to_digit(10).unwrap() as u8;
let blue = (s.as_bytes()[5] as char).to_digit(10).unwrap() as u8;
Color::Indexed(16 + red * 36 + green * 6 + blue)
} else if s == "white" {
Color::White
} else if s == "black" {
Color::Black
} else {
if s == "white" {
Color::White
} else if s == "black" {
Color::Black
} else {
Color::Indexed(15)
}
Color::Indexed(15)
}
}
pub fn get_tcolor(line: &str) -> TColor {
if line.contains(" on ") {
let foreground = line.split(" ").collect::<Vec<&str>>()[0];
let background = line.split(" ").collect::<Vec<&str>>()[2];
let foreground = line.split(' ').collect::<Vec<&str>>()[0];
let background = line.split(' ').collect::<Vec<&str>>()[2];
TColor {
fg: get_color(foreground),
bg: get_color(background),
}
} else if line.contains("on ") {
let background = line.split(" ").collect::<Vec<&str>>()[1];
let background = line.split(' ').collect::<Vec<&str>>()[1];
TColor {
fg: Color::Indexed(0),
bg: get_color(background),
@ -186,7 +184,7 @@ impl TConfig {
if line.starts_with(attribute) {
color_collection.insert(
attribute.to_string(),
get_tcolor(line.trim_start_matches(attribute).trim_start_matches(" ")),
get_tcolor(line.trim_start_matches(attribute).trim_start_matches(' ')),
);
}
}
@ -198,7 +196,7 @@ impl TConfig {
if line.starts_with(attribute) {
bool_collection.insert(
attribute.to_string(),
line.trim_start_matches(attribute).trim_start_matches(" ") == "yes",
line.trim_start_matches(attribute).trim_start_matches(' ') == "yes",
);
}
}
@ -208,119 +206,119 @@ impl TConfig {
enabled: true,
obfuscate: bool_collection.get("obfuscate").cloned().unwrap_or(false),
print_empty_columns: bool_collection.get("print_empty_columns").cloned().unwrap_or(false),
color_active: color_collection.get("active").cloned().unwrap_or(TColor::default()),
color_alternate: color_collection.get("alternate").cloned().unwrap_or(TColor::default()),
color_blocked: color_collection.get("blocked").cloned().unwrap_or(TColor::default()),
color_blocking: color_collection.get("blocking").cloned().unwrap_or(TColor::default()),
color_active: color_collection.get("active").cloned().unwrap_or_else(TColor::default),
color_alternate: color_collection.get("alternate").cloned().unwrap_or_else(TColor::default),
color_blocked: color_collection.get("blocked").cloned().unwrap_or_else(TColor::default),
color_blocking: color_collection.get("blocking").cloned().unwrap_or_else(TColor::default),
color_burndown_done: color_collection
.get("burndown.done")
.cloned()
.unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_burndown_pending: color_collection
.get("burndown.pending")
.cloned()
.unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_burndown_started: color_collection
.get("burndown.started")
.cloned()
.unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_calendar_due: color_collection
.get("calendar.due")
.cloned()
.unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_calendar_due_today: color_collection
.get("calendar.due.today")
.cloned()
.unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_calendar_holiday: color_collection
.get("calendar.holiday")
.cloned()
.unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_calendar_overdue: color_collection
.get("calendar.overdue")
.cloned()
.unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_calendar_today: color_collection
.get("calendar.today")
.cloned()
.unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_calendar_weekend: color_collection
.get("calendar.weekend")
.cloned()
.unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_calendar_weeknumber: color_collection
.get("calendar.weeknumber")
.cloned()
.unwrap_or(TColor::default()),
color_completed: color_collection.get("completed").cloned().unwrap_or(TColor::default()),
color_debug: color_collection.get("debug").cloned().unwrap_or(TColor::default()),
color_deleted: color_collection.get("deleted").cloned().unwrap_or(TColor::default()),
color_due: color_collection.get("due").cloned().unwrap_or(TColor::default()),
color_due_today: color_collection.get("due.today").cloned().unwrap_or(TColor::default()),
color_error: color_collection.get("error").cloned().unwrap_or(TColor::default()),
color_footnote: color_collection.get("footnote").cloned().unwrap_or(TColor::default()),
color_header: color_collection.get("header").cloned().unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_completed: color_collection.get("completed").cloned().unwrap_or_else(TColor::default),
color_debug: color_collection.get("debug").cloned().unwrap_or_else(TColor::default),
color_deleted: color_collection.get("deleted").cloned().unwrap_or_else(TColor::default),
color_due: color_collection.get("due").cloned().unwrap_or_else(TColor::default),
color_due_today: color_collection.get("due.today").cloned().unwrap_or_else(TColor::default),
color_error: color_collection.get("error").cloned().unwrap_or_else(TColor::default),
color_footnote: color_collection.get("footnote").cloned().unwrap_or_else(TColor::default),
color_header: color_collection.get("header").cloned().unwrap_or_else(TColor::default),
color_history_add: color_collection
.get("history.add")
.cloned()
.unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_history_delete: color_collection
.get("history.delete")
.cloned()
.unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_history_done: color_collection
.get("history.done")
.cloned()
.unwrap_or(TColor::default()),
color_label: color_collection.get("label").cloned().unwrap_or(TColor::default()),
color_label_sort: color_collection.get("label.sort").cloned().unwrap_or(TColor::default()),
color_overdue: color_collection.get("overdue").cloned().unwrap_or(TColor::default()),
color_project: color_collection.get("project").cloned().unwrap_or(TColor::default()),
color_recurring: color_collection.get("recurring").cloned().unwrap_or(TColor::default()),
color_scheduled: color_collection.get("scheduled").cloned().unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_label: color_collection.get("label").cloned().unwrap_or_else(TColor::default),
color_label_sort: color_collection.get("label.sort").cloned().unwrap_or_else(TColor::default),
color_overdue: color_collection.get("overdue").cloned().unwrap_or_else(TColor::default),
color_project: color_collection.get("project").cloned().unwrap_or_else(TColor::default),
color_recurring: color_collection.get("recurring").cloned().unwrap_or_else(TColor::default),
color_scheduled: color_collection.get("scheduled").cloned().unwrap_or_else(TColor::default),
color_summary_background: color_collection
.get("summary.background")
.cloned()
.unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_summary_bar: color_collection
.get("summary_bar")
.cloned()
.unwrap_or(TColor::default()),
color_sync_added: color_collection.get("sync.added").cloned().unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_sync_added: color_collection.get("sync.added").cloned().unwrap_or_else(TColor::default),
color_sync_changed: color_collection
.get("sync.changed")
.cloned()
.unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_sync_rejected: color_collection
.get("sync.rejected")
.cloned()
.unwrap_or(TColor::default()),
color_tag_next: color_collection.get("tag.next").cloned().unwrap_or(TColor::default()),
color_tag: color_collection.get("tag").cloned().unwrap_or(TColor::default()),
color_tagged: color_collection.get("tagged").cloned().unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_tag_next: color_collection.get("tag.next").cloned().unwrap_or_else(TColor::default),
color_tag: color_collection.get("tag").cloned().unwrap_or_else(TColor::default),
color_tagged: color_collection.get("tagged").cloned().unwrap_or_else(TColor::default),
color_uda_priority: color_collection
.get("uda.priority")
.cloned()
.unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_uda_priority_h: color_collection
.get("uda.priority.h")
.cloned()
.unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_uda_priority_l: color_collection
.get("uda.priority.l")
.cloned()
.unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_uda_priority_m: color_collection
.get("uda.priority.m")
.cloned()
.unwrap_or(TColor::default()),
color_undo_after: color_collection.get("undo.after").cloned().unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_undo_after: color_collection.get("undo.after").cloned().unwrap_or_else(TColor::default),
color_undo_before: color_collection
.get("undo.before")
.cloned()
.unwrap_or(TColor::default()),
color_until: color_collection.get("until").cloned().unwrap_or(TColor::default()),
color_warning: color_collection.get("warning").cloned().unwrap_or(TColor::default()),
.unwrap_or_else(TColor::default),
color_until: color_collection.get("until").cloned().unwrap_or_else(TColor::default),
color_warning: color_collection.get("warning").cloned().unwrap_or_else(TColor::default),
}
}
}