Apply clippy suggestions and improve code quality

4 files changed, 13 insertions, 14 deletions

diff --git a/legacy_data/src/data/local/workspace_analyzer.rs b/legacy_data/src/data/local/workspace_analyzer.rs
index 82cd4e0..6373525 100644
--- a/legacy_data/src/data/local/workspace_analyzer.rs
+++ b/legacy_data/src/data/local/workspace_analyzer.rs
@@ -180,8 +180,8 @@ impl<'a> AnalyzeResult<'a> {
         // Files that exist locally but not in remote
         let mut erased_files: HashSet<PathBuf> = HashSet::new();
 
-        if let Some(cached_data) = &analyze_ctx.cached_sheet_data {
-            if let Some(local_sheet) = &analyze_ctx.local_sheet {
+        if let Some(cached_data) = &analyze_ctx.cached_sheet_data
+            && let Some(local_sheet) = &analyze_ctx.local_sheet {
                 let cached_sheet_mapping = cached_data.mapping();
                 let local_sheet_mapping = &local_sheet.data.mapping;
 
@@ -192,7 +192,6 @@ impl<'a> AnalyzeResult<'a> {
                     }
                 }
             }
-        }
 
         // Files that exist in the local sheet but not in reality are considered lost
         let mut lost_files: HashSet<&PathBuf> = local_sheet_paths
diff --git a/legacy_data/src/data/vault/mapping_share.rs b/legacy_data/src/data/vault/mapping_share.rs
index 59cd6ba..2635b48 100644
--- a/legacy_data/src/data/vault/mapping_share.rs
+++ b/legacy_data/src/data/vault/mapping_share.rs
@@ -294,12 +294,11 @@ impl<'a> Sheet<'a> {
             }
 
             // Check for duplicate IDs
-            if let Some(id_mapping) = self.id_mapping() {
-                if id_mapping.contains_key(&metadata.id) {
+            if let Some(id_mapping) = self.id_mapping()
+                && id_mapping.contains_key(&metadata.id) {
                     conflicts.duplicate_file.push(mapping.clone());
                     continue;
                 }
-            }
         }
 
         conflicts
@@ -411,8 +410,7 @@ impl Share {
         match fs::remove_file(path).await {
             Err(err) => Err((
                 self,
-                Error::new(
-                    std::io::ErrorKind::Other,
+                Error::other(
                     format!("Failed to delete share file: {}", err),
                 ),
             )),
diff --git a/legacy_data/src/data/vault/vault_config.rs b/legacy_data/src/data/vault/vault_config.rs
index caa8552..156083b 100644
--- a/legacy_data/src/data/vault/vault_config.rs
+++ b/legacy_data/src/data/vault/vault_config.rs
@@ -52,18 +52,18 @@ pub enum BehaviourEnabled {
     No,
 }
 
-impl Into<bool> for ServiceEnabled {
-    fn into(self) -> bool {
-        match self {
+impl From<ServiceEnabled> for bool {
+    fn from(val: ServiceEnabled) -> Self {
+        match val {
             ServiceEnabled::Enable => true,
             ServiceEnabled::Disable => false,
         }
     }
 }
 
-impl Into<bool> for BehaviourEnabled {
-    fn into(self) -> bool {
-        match self {
+impl From<BehaviourEnabled> for bool {
+    fn from(val: BehaviourEnabled) -> Self {
+        match val {
             BehaviourEnabled::Yes => true,
             BehaviourEnabled::No => false,
         }
diff --git a/legacy_data/src/lib.rs b/legacy_data/src/lib.rs
index df2ec34..d2e64b4 100644
--- a/legacy_data/src/lib.rs
+++ b/legacy_data/src/lib.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::type_complexity)]
+
 pub mod constants;
 pub mod env;