Fix clippy lints

flosse · Jun 17, 2024 · 88ce314 · 88ce314
1 parent aeaa273
commit 88ce314
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/adapter/src/model/app/area_of_life.rs b/crates/adapter/src/model/app/area_of_life.rs
@@ -1,7 +1,9 @@
-use cawr_domain::area_of_life as aol;
-use std::str::FromStr;
+use std::{fmt, str::FromStr};
+
 use thiserror::Error;
 
+use cawr_domain::area_of_life as aol;
+
 /// This is the public ID of an area of life.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct Id(u64);
@@ -36,9 +38,9 @@ impl FromStr for Id {
     }
 }
 
-impl ToString for Id {
-    fn to_string(&self) -> String {
-        self.0.to_string()
+impl fmt::Display for Id {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.0)
     }
 }
 

diff --git a/crates/adapter/src/model/app/thought.rs b/crates/adapter/src/model/app/thought.rs
@@ -1,7 +1,9 @@
-use cawr_domain::thought;
-use std::str::FromStr;
+use std::{fmt, str::FromStr};
+
 use thiserror::Error;
 
+use cawr_domain::thought;
+
 /// This is the public ID of a thought.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct Id(u64);
@@ -36,9 +38,9 @@ impl FromStr for Id {
     }
 }
 
-impl ToString for Id {
-    fn to_string(&self) -> String {
-        self.0.to_string()
+impl fmt::Display for Id {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.0)
     }
 }
 

diff --git a/crates/application/Cargo.toml b/crates/application/Cargo.toml
@@ -11,4 +11,5 @@ cawr-domain = "=0.0.0"
 
 # External dependencies
 log = "0.4"
+parking_lot = "0.12"
 thiserror = "1.0"
diff --git a/crates/application/src/usecase/thought/create.rs b/crates/application/src/usecase/thought/create.rs
@@ -1,3 +1,7 @@
+use std::collections::HashSet;
+
+use thiserror::Error;
+
 use crate::{
     gateway::repository::{
         area_of_life,
@@ -13,8 +17,6 @@ use cawr_domain::{
     area_of_life as aol,
     thought::{Id, Thought, Title},
 };
-use std::collections::HashSet;
-use thiserror::Error;
 
 #[derive(Debug)]
 pub struct Request {
@@ -98,7 +100,7 @@ where
 mod tests {
     use super::*;
     use crate::gateway::repository::thought::{DeleteError, GetAllError, GetError};
-    use std::sync::RwLock;
+    use parking_lot::RwLock;
 
     #[derive(Default)]
     struct MockRepo {
@@ -107,7 +109,7 @@ mod tests {
 
     impl thought::Repo for MockRepo {
         fn save(&self, record: Record) -> Result<(), SaveError> {
-            *self.thought.write().unwrap() = Some(record);
+            *self.thought.write() = Some(record);
             Ok(())
         }
         fn get(&self, _: Id) -> Result<Record, GetError> {
@@ -157,7 +159,6 @@ mod tests {
         assert_eq!(
             repo.thought
                 .read()
-                .unwrap()
                 .as_ref()
                 .unwrap()
                 .thought

diff --git a/crates/cli/src/lib.rs b/crates/cli/src/lib.rs
@@ -16,7 +16,7 @@ pub fn run<D>(db: Arc<D>, cmd: Command)
 where
     D: Db,
 {
-    let app_api = Api::new(db, Presenter::default());
+    let app_api = Api::new(db, Presenter);
 
     match cmd {
         Command::Create { title } => {

diff --git a/crates/db/Cargo.toml b/crates/db/Cargo.toml
@@ -15,6 +15,7 @@ cawr-domain = "=0.0.0"
 # External dependencies
 log = "0.4"
 jfs = "0.9"
+parking_lot = "0.12"
 serde = { version = "1.0", features = ["derive"] }
 
 [dev-dependencies]

diff --git a/crates/db/src/in_memory.rs b/crates/db/src/in_memory.rs
@@ -1,11 +1,14 @@
+use std::collections::HashMap;
+
+use parking_lot::RwLock;
+
 use cawr_adapter::db::Db;
 use cawr_application::{
     gateway::repository::{
         area_of_life::Record as AreaOfLifeRecord, thought::Record as ThoughtRecord,
     },
     identifier::{NewId, NewIdError},
 };
-use std::{collections::HashMap, sync::RwLock};
 
 #[derive(Default)]
 pub struct InMemory {
@@ -24,16 +27,12 @@ mod thought {
 
     impl Repo for InMemory {
         fn save(&self, record: Record) -> Result<(), SaveError> {
-            self.thoughts
-                .write()
-                .unwrap()
-                .insert(record.thought.id(), record);
+            self.thoughts.write().insert(record.thought.id(), record);
             Ok(())
         }
         fn get(&self, id: Id) -> Result<Record, GetError> {
             self.thoughts
                 .read()
-                .unwrap()
                 .get(&id)
                 .cloned()
                 .ok_or(GetError::NotFound)
@@ -42,7 +41,6 @@ mod thought {
             Ok(self
                 .thoughts
                 .read()
-                .unwrap()
                 .iter()
                 .map(|(_, r)| r)
                 .cloned()
@@ -51,7 +49,6 @@ mod thought {
         fn delete(&self, id: Id) -> Result<(), DeleteError> {
             self.thoughts
                 .write()
-                .unwrap()
                 .remove(&id)
                 .map(|_| ())
                 .ok_or(DeleteError::NotFound)
@@ -63,7 +60,6 @@ mod thought {
             let next = self
                 .thoughts
                 .read()
-                .unwrap()
                 .iter()
                 .map(|(id, _)| id.to_u64())
                 .max()
@@ -85,14 +81,12 @@ mod area_of_life {
         fn save(&self, record: Record) -> Result<(), SaveError> {
             self.areas_of_life
                 .write()
-                .unwrap()
                 .insert(record.area_of_life.id(), record);
             Ok(())
         }
         fn get(&self, id: Id) -> Result<Record, GetError> {
             self.areas_of_life
                 .read()
-                .unwrap()
                 .get(&id)
                 .cloned()
                 .ok_or(GetError::NotFound)
@@ -101,7 +95,6 @@ mod area_of_life {
             Ok(self
                 .areas_of_life
                 .read()
-                .unwrap()
                 .iter()
                 .map(|(_, r)| r)
                 .cloned()
@@ -110,7 +103,6 @@ mod area_of_life {
         fn delete(&self, id: Id) -> Result<(), DeleteError> {
             self.areas_of_life
                 .write()
-                .unwrap()
                 .remove(&id)
                 .map(|_| ())
                 .ok_or(DeleteError::NotFound)
@@ -122,7 +114,6 @@ mod area_of_life {
             let next = self
                 .areas_of_life
                 .read()
-                .unwrap()
                 .iter()
                 .map(|(id, _)| id.to_u64())
                 .max()

diff --git a/crates/desktop-egui/src/lib.rs b/crates/desktop-egui/src/lib.rs
@@ -22,7 +22,7 @@ where
         .enable_all()
         .build()
         .unwrap();
-    let app_api = Api::new(db, Presenter::default());
+    let app_api = Api::new(db, Presenter);
     let options = eframe::NativeOptions::default();
     eframe::run_native(
         TITLE,

diff --git a/crates/domain/src/value_object/id.rs b/crates/domain/src/value_object/id.rs
@@ -27,7 +27,7 @@ impl<T> Id<T> {
 
 impl<T> Clone for Id<T> {
     fn clone(&self) -> Self {
-        Self::new(self.id)
+        *self
     }
 }
 

diff --git a/crates/web-server-warp/src/handler/thought/find_by_id.rs b/crates/web-server-warp/src/handler/thought/find_by_id.rs
@@ -91,6 +91,6 @@ mod tests {
 
         assert_eq!(err.msg, None);
         assert_eq!(err.status, json::StatusCode::INTERNAL_SERVER_ERROR);
-        assert!(matches!(err.details, None));
+        assert!(err.details.is_none());
     }
 }
diff --git a/crates/web-server-warp/src/lib.rs b/crates/web-server-warp/src/lib.rs
@@ -14,7 +14,7 @@ pub async fn run<D>(db: Arc<D>, addr: SocketAddr)
 where
     D: Db,
 {
-    let web_app_api = Api::new(db, Presenter::default());
+    let web_app_api = Api::new(db, Presenter);
     let api = route::api(web_app_api);
     let routes = api.or(webapp::get_index()).or(webapp::get_assets());
     warp::serve(routes).run(addr).await;

diff --git a/crates/web-server-warp/src/tests.rs b/crates/web-server-warp/src/tests.rs
@@ -15,14 +15,14 @@ pub fn blank_db() -> Arc<InMemory> {
 }
 
 pub fn corrupt_db() -> Arc<CorruptTestDb> {
-    Arc::new(CorruptTestDb::default())
+    Arc::new(CorruptTestDb)
 }
 
 pub fn app_api<D>(db: Arc<D>) -> AppApi<D>
 where
     D: Db,
 {
-    Api::new(db, Presenter::default())
+    Api::new(db, Presenter)
 }
 
 #[derive(Default)]