feature: make clippy happy

shenek · Jan 19, 2024 · f1d9fe3 · f1d9fe3
1 parent a2bc4c8
commit f1d9fe3
Show file tree

Hide file tree

Showing 20 changed files with 64 additions and 163 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ucelofka-data/src/invoice/v1.rs b/ucelofka-data/src/invoice/v1.rs
@@ -71,7 +71,7 @@ impl Invoice {
             .iter()
             .map(|i| i.id + 1)
             .max()
-            .unwrap_or_else(|| Utc::today().naive_utc().year() as u64 * 100_000 + 1)
+            .unwrap_or_else(|| Utc::now().date_naive().year() as u64 * 100_000 + 1)
     }
 
     pub fn new(
@@ -86,7 +86,7 @@ impl Invoice {
         Self {
             _version: VERSION,
             id: new_id,
-            issue_day: Utc::today().format("%Y-%m-%d").to_string(),
+            issue_day: Utc::now().format("%Y-%m-%d").to_string(),
             due_day: (Utc::now() + Duration::days(DEFAULT_DUE))
                 .format("%Y-%m-%d")
                 .to_string(),

diff --git a/ucelofka-data/src/invoice/v2.rs b/ucelofka-data/src/invoice/v2.rs
@@ -94,7 +94,7 @@ impl Invoice {
             .iter()
             .map(|i| i.id + 1)
             .max()
-            .unwrap_or_else(|| Utc::today().naive_utc().year() as u64 * 100_000 + 1)
+            .unwrap_or_else(|| Utc::now().date_naive().year() as u64 * 100_000 + 1)
     }
 
     pub fn new(
@@ -110,7 +110,7 @@ impl Invoice {
         Self {
             _version: VERSION,
             id: new_id,
-            issue_date: Utc::today().format("%Y-%m-%d").to_string(),
+            issue_date: Utc::now().format("%Y-%m-%d").to_string(),
             due_date: (Utc::now()
                 + Duration::days(
                     due.map(|v| i64::try_from(v).unwrap())

diff --git a/ucelofka-data/src/lib.rs b/ucelofka-data/src/lib.rs
@@ -28,17 +28,17 @@ struct Ver {
     pub _version: u32,
 }
 
-impl Into<u32> for Ver {
-    fn into(self) -> u32 {
-        self._version
+impl From<Ver> for u32 {
+    fn from(value: Ver) -> Self {
+        value._version
     }
 }
 
 impl TryFrom<&str> for Ver {
     type Error = serde_yaml::Error;
 
     fn try_from(input: &str) -> Result<Self, Self::Error> {
-        Ok(serde_yaml::from_str(input)?)
+        serde_yaml::from_str(input)
     }
 }
 
@@ -69,7 +69,7 @@ macro_rules! data_try_from {
             type Error = serde_yaml::Error;
 
             fn try_from(input: String) -> Result<Self, Self::Error> {
-                Ok(serde_yaml::from_str(&input)?)
+                serde_yaml::from_str(&input)
             }
         }
     };

diff --git a/ucelofka-data/src/template/v1.rs b/ucelofka-data/src/template/v1.rs
@@ -17,7 +17,7 @@ pub struct Template {
     pub text: Option<String>,
 }
 
-impl<'a> fmt::Display for Template {
+impl fmt::Display for Template {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{} ({})", self.name, self.path.to_str().unwrap())?;
         if let Some(text) = &self.text {

diff --git a/ucelofka/src/actions/account.rs b/ucelofka/src/actions/account.rs
@@ -13,7 +13,7 @@ pub fn ids(data_path: &Path) -> Result<String> {
 
 pub fn list(data_path: &Path) -> Result<Accounts> {
     let account_path = data_path.join(Path::new("accounts"));
-    Ok(Accounts::load(account_path.as_path())?)
+    Accounts::load(account_path.as_path())
 }
 
 pub fn get(data_path: &Path, id: &str) -> Result<Account> {

diff --git a/ucelofka/src/actions/customer.rs b/ucelofka/src/actions/customer.rs
@@ -13,11 +13,11 @@ pub fn ids(data_path: &Path) -> Result<String> {
 
 pub fn list(data_path: &Path) -> Result<Customers> {
     let customer_path = data_path.join(Path::new("customers"));
-    Ok(Customers::load(customer_path.as_path())?)
+    Customers::load(customer_path.as_path())
 }
 
 pub fn get(data_path: &Path, id: &str) -> Result<Customer> {
-    Ok(list(data_path)?
+    list(data_path)?
         .get(id)
-        .ok_or_else(|| anyhow!("Customer {} not found.", id))?)
+        .ok_or_else(|| anyhow!("Customer {} not found.", id))
 }
diff --git a/ucelofka/src/actions/entry.rs b/ucelofka/src/actions/entry.rs
@@ -14,13 +14,13 @@ pub fn ids(data_path: &Path) -> Result<String> {
 
 pub fn list(data_path: &Path) -> Result<Entries> {
     let entry_path = data_path.join(Path::new("entries"));
-    Ok(Entries::load(entry_path.as_path())?)
+    Entries::load(entry_path.as_path())
 }
 
 pub fn get(data_path: &Path, id: &str) -> Result<Entry> {
-    Ok(list(data_path)?
+    list(data_path)?
         .get(id)
-        .ok_or_else(|| anyhow!("Entry {} not found.", id))?)
+        .ok_or_else(|| anyhow!("Entry {} not found.", id))
 }
 
 pub fn create(

diff --git a/ucelofka/src/actions/identity.rs b/ucelofka/src/actions/identity.rs
@@ -13,11 +13,11 @@ pub fn ids(data_path: &Path) -> Result<String> {
 
 pub fn list(data_path: &Path) -> Result<Identities> {
     let identity_path = data_path.join(Path::new("identities"));
-    Ok(Identities::load(identity_path.as_path())?)
+    Identities::load(identity_path.as_path())
 }
 
 pub fn get(data_path: &Path, id: &str) -> Result<Identity> {
-    Ok(list(data_path)?
+    list(data_path)?
         .get(id)
-        .ok_or_else(|| anyhow!("Identity {} not found.", id))?)
+        .ok_or_else(|| anyhow!("Identity {} not found.", id))
 }
diff --git a/ucelofka/src/actions/ids.rs b/ucelofka/src/actions/ids.rs
@@ -25,7 +25,7 @@ pub fn ids(data_path: &Path) -> Result<String> {
     result += &template::list(data_path)?
         .templates
         .iter()
-        .map(|template| format!("{}\n", template.name))
+        .map(|template| template.name.clone() + "\n")
         .collect::<String>();
 
     Ok(result)