From b76a20186b1e0cd9cdcd57fc36292319c13048fb Mon Sep 17 00:00:00 2001
From: Dheepak Krishnamurthy <me@kdheepak.com>
Date: Thu, 22 Oct 2020 22:02:42 -0600
Subject: [PATCH] Run cargo clippy

---
 src/app.rs      | 15 +++++----------
 src/calendar.rs |  7 +++----
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/app.rs b/src/app.rs
index ffe1cdc..4cce3bc 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -408,12 +408,8 @@ impl TTApp {
                 .expect(format!("Unable to run `task _get rc.context.{}`", self.context_name).as_str())
                 .stdout,
         )
-        .expect(
-            format!(
-                "Unable to decode utf8 from stdout of `task _get rc.context.{}`",
-                self.context_name
-            )
-            .as_str(),
+        .unwrap_or_else(
+            |_| panic!("Unable to decode utf8 from stdout of `task _get rc.context.{}`", self.context_name)
         );
         self.context_filter = self.context_filter.strip_suffix('\n').unwrap_or("").to_string();
     }
@@ -461,7 +457,7 @@ impl TTApp {
             tasks_with_styles
                 .extend(tasks_with_due_dates.map(|t| (t.due().unwrap().clone().date(), self.style_for_task(t))))
         }
-        return tasks_with_styles;
+        tasks_with_styles
     }
 
     pub fn draw_task(&mut self, f: &mut Frame<impl Backend>) {
@@ -1291,13 +1287,12 @@ impl TTApp {
                 add_tag(&mut task, "ANNOTATED".to_string());
             }
             if task.tags().is_some() {
-                let tags = task
+                if !task
                     .tags()
                     .unwrap()
                     .iter()
                     .filter(|s| !self.task_report_table.virtual_tags.contains(s))
-                    .collect::<Vec<_>>();
-                if !tags.is_empty() {
+                    .next().is_none() {
                     add_tag(&mut task, "TAGGED".to_string());
                 }
             }
diff --git a/src/calendar.rs b/src/calendar.rs
index 234ce87..f9888f5 100644
--- a/src/calendar.rs
+++ b/src/calendar.rs
@@ -155,7 +155,7 @@ impl<'a> Widget for Calendar<'a> {
         );
 
         let mut startm = 0 as usize;
-        if self.months_per_row > area.width as usize / 8 / 3 || self.months_per_row <= 0 {
+        if self.months_per_row > area.width as usize / 8 / 3 || self.months_per_row == 0 {
             self.months_per_row = area.width as usize / 8 / 3;
         }
         let mut y = area.y;
@@ -177,11 +177,10 @@ impl<'a> Widget for Calendar<'a> {
         loop {
             let endm = std::cmp::min(startm + self.months_per_row, 12);
             let mut x = area.x + startx;
-            for c in startm..endm {
+            for (c, d) in days.iter_mut().enumerate().skip(startm).take(endm) {
                 if c > startm {
                     x += 1;
                 }
-                let d = &mut days[c];
                 let m = d.0.month() as usize;
                 let s = format!("{:^20}", month_names[m - 1]);
                 let style = Style::default().bg(Color::Rgb(220, 220, 220));
@@ -194,7 +193,7 @@ impl<'a> Widget for Calendar<'a> {
             }
             y += 1;
             let mut x = area.x + startx;
-            for d in days.iter_mut().skip(startm).take(endm) {
+            for (_, d) in days.iter_mut().enumerate().skip(startm).take(endm) {
                 let m = d.0.month() as usize;
                 let style = Style::default().bg(Color::Rgb(220, 220, 220));
                 if m == today.month() as usize && self.year + year as i32 == today.year() {