Applying clippy fixes to dev-tracker-core.

Author: keithsharp

dev-tracker-core/src/data.rs

@@ -102,9 +102,9 @@ impl DataStore {
         let mut projects = Project::get_with_name(name, &self.conn)?;
 
         if projects.len() == 1 {
-            return Ok(Some(projects.remove(0)));
+            Ok(Some(projects.remove(0)))
         } else {
-            return Ok(None);
+            Ok(None)
         }
     }
 
@@ -171,9 +171,9 @@ impl DataStore {
         let mut ats = ActivityType::get_with_name(name, &self.conn)?;
 
         if ats.len() == 1 {
-            return Ok(Some(ats.remove(0)));
+            Ok(Some(ats.remove(0)))
         } else {
-            return Ok(None);
+            Ok(None)
         }
     }
 
@@ -260,9 +260,9 @@ impl DataStore {
             .collect();
 
         if activities.len() == 1 {
-            return Ok(Some(activities.remove(0)));
+            Ok(Some(activities.remove(0)))
         } else {
-            return Ok(None);
+            Ok(None)
         }
     }
 
@@ -322,9 +322,9 @@ impl DataStore {
         let mut repos = Repo::get_with_path(path, &self.conn)?;
 
         if repos.len() == 1 {
-            return Ok(Some(repos.remove(0)));
+            Ok(Some(repos.remove(0)))
         } else {
-            return Ok(None);
+            Ok(None)
         }
     }
 
@@ -404,6 +404,7 @@ impl DataStore {
 
     pub fn get_latest_count(&self, repo: &Repo) -> Result<Option<Count>, Error> {
         let mut counts = self.get_counts(repo)?;
+        #[allow(clippy::comparison_chain)]
         counts.sort_by(|a, b| {
             if a.date < b.date {
                 Ordering::Less
@@ -414,10 +415,10 @@ impl DataStore {
             }
         });
 
-        if counts.len() > 0 {
-            return Ok(Some(counts.remove(counts.len() - 1)));
+        if !counts.is_empty() {
+            Ok(Some(counts.remove(counts.len() - 1)))
         } else {
-            return Ok(None);
+            Ok(None)
         }
     }
 

dev-tracker-core/src/model/activity.rs

@@ -58,8 +58,8 @@ impl Activity {
     pub fn new(project: u64, atype: u64, description: Option<String>) -> Self {
         Self {
             id: 0,
-            project: project,
-            atype: atype,
+            project,
+            atype,
             description,
             start: Utc::now(),
             end: None,
@@ -149,9 +149,9 @@ impl Activity {
             .collect();
 
         if activities.len() == 1 {
-            return Ok(Some(activities.remove(0)));
+            Ok(Some(activities.remove(0)))
         } else {
-            return Ok(None);
+            Ok(None)
         }
     }
 
@@ -210,7 +210,7 @@ impl Activity {
     pub(crate) fn delete(self, conn: &Connection) -> Result<(), Error> {
         conn.execute(
             "DELETE FROM activities WHERE id=?1",
-            &[&self.id.to_string()],
+            [&self.id.to_string()],
         )?;
         Ok(())
     }

dev-tracker-core/src/model/activitytype.rs

@@ -90,9 +90,9 @@ impl ActivityType {
             .collect();
 
         if ats.len() == 1 {
-            return Ok(Some(ats.remove(0)));
+            Ok(Some(ats.remove(0)))
         } else {
-            return Ok(None);
+            Ok(None)
         }
     }
 
@@ -139,7 +139,7 @@ impl ActivityType {
     }
 
     pub(crate) fn delete(self, conn: &Connection) -> Result<(), Error> {
-        conn.execute("DELETE FROM activitytypes WHERE id=?1", &[&self.id])?;
+        conn.execute("DELETE FROM activitytypes WHERE id=?1", [&self.id])?;
         Ok(())
     }
 }

dev-tracker-core/src/model/count.rs

@@ -87,16 +87,16 @@ impl Count {
                     id: row.get(0)?,
                     repo: row.get(1)?,
                     date: row.get(2)?,
-                    count: count,
+                    count,
                 })
             })?
             .filter_map(|p| p.ok())
             .collect();
 
         if counts.len() == 1 {
-            return Ok(Some(counts.remove(0)));
+            Ok(Some(counts.remove(0)))
         } else {
-            return Ok(None);
+            Ok(None)
         }
     }
 
@@ -110,7 +110,7 @@ impl Count {
                     id: row.get(0)?,
                     repo: row.get(1)?,
                     date: row.get(2)?,
-                    count: count,
+                    count,
                 })
             })?
             .filter_map(|p| p.ok())
@@ -120,7 +120,7 @@ impl Count {
     }
 
     pub(crate) fn delete(self, conn: &Connection) -> Result<(), Error> {
-        conn.execute("DELETE FROM counts WHERE id=?1", &[&self.id])?;
+        conn.execute("DELETE FROM counts WHERE id=?1", [&self.id])?;
         Ok(())
     }
 }

dev-tracker-core/src/model/project.rs

@@ -47,7 +47,7 @@ impl Project {
 
 impl Project {
     pub(crate) fn create(&self, conn: &Connection) -> Result<(), Error> {
-        conn.execute("INSERT INTO projects (name) VALUES (?1)", &[&self.name])?;
+        conn.execute("INSERT INTO projects (name) VALUES (?1)", [&self.name])?;
         Ok(())
     }
 
@@ -64,9 +64,9 @@ impl Project {
             .collect();
 
         if projects.len() == 1 {
-            return Ok(Some(projects.remove(0)));
+            Ok(Some(projects.remove(0)))
         } else {
-            return Ok(None);
+            Ok(None)
         }
     }
 
@@ -110,7 +110,7 @@ impl Project {
     }
 
     pub(crate) fn delete(self, conn: &Connection) -> Result<(), Error> {
-        conn.execute("DELETE FROM projects WHERE id=?1", &[&self.id])?;
+        conn.execute("DELETE FROM projects WHERE id=?1", [&self.id])?;
         Ok(())
     }
 }

dev-tracker-core/src/model/repo.rs

@@ -86,9 +86,9 @@ impl Repo {
             .collect();
 
         if repos.len() == 1 {
-            return Ok(Some(repos.remove(0)));
+            Ok(Some(repos.remove(0)))
         } else {
-            return Ok(None);
+            Ok(None)
         }
     }
 
@@ -136,7 +136,7 @@ impl Repo {
     }
 
     pub(crate) fn delete(self, conn: &Connection) -> Result<(), Error> {
-        conn.execute("DELETE FROM repos WHERE id=?1", &[&self.id])?;
+        conn.execute("DELETE FROM repos WHERE id=?1", [&self.id])?;
         Ok(())
     }
 }