ref: correct fmt

Author: raphael-goetz

cli/src/analyser/diagnostics.rs

@@ -113,10 +113,10 @@ impl DiagnosticKind {
             | DuplicateRuntimeFunctionIdentifier { .. }
             | DuplicateRuntimeParameterIdentifier { .. }
             | GenericKeyNotInMappingTarget { .. }
-            | EmptyGenericMapper { .. }
+            | EmptyGenericMapper
             | UndefinedDataTypeIdentifier { .. }
             | NullField { .. }
-            | ForbiddenVariant { .. }
+            | ForbiddenVariant
             | UnusedGenericKey { .. }
             | UndefinedGenericKey { .. } => Severity::Error,
             UndefinedTranslation { .. } => Severity::Warning,

cli/src/analyser/mod.rs

@@ -471,26 +471,24 @@ impl Analyser {
         }
 
         // Check if input identifier exists
-        if let Some(identifier) = flow.input_type_identifier {
-            if !self.data_type_identifier_exists(identifier.clone(), -1) {
+        if let Some(identifier) = flow.input_type_identifier
+            && !self.data_type_identifier_exists(identifier.clone(), -1) {
                 self.reporter.add_report(Diagnose::new(
                     name.clone(),
                     original_definition.clone(),
                     UndefinedDataTypeIdentifier { identifier },
                 ));
             }
-        }
 
         // Check if return identifier exists
-        if let Some(identifier) = flow.return_type_identifier {
-            if !self.data_type_identifier_exists(identifier.clone(), -1) {
+        if let Some(identifier) = flow.return_type_identifier
+            && !self.data_type_identifier_exists(identifier.clone(), -1) {
                 self.reporter.add_report(Diagnose::new(
                     name.clone(),
                     original_definition.clone(),
                     UndefinedDataTypeIdentifier { identifier },
                 ));
             }
-        }
 
         // Check if flow type identifier already exists
         for flow_type in &self.flow_types {

cli/src/command/download.rs

@@ -180,17 +180,15 @@ async fn convert_bytes_to_folder(bytes: Bytes, zip_path: &str) {
                 panic!("Failed to create directory {}: {}", out_path.display(), e);
             }
         } else {
-            if let Some(p) = out_path.parent() {
-                if !p.exists() {
-                    if let Err(e) = fs::create_dir_all(p) {
+            if let Some(p) = out_path.parent()
+                && !p.exists()
+                    && let Err(e) = fs::create_dir_all(p) {
                         panic!(
                             "Warning: Failed to create parent directory {}: {}",
                             p.display(),
                             e
                         );
                     }
-                }
-            }
 
             match File::create(&out_path) {
                 Ok(mut outfile) => {

cli/src/command/feature.rs

@@ -21,8 +21,7 @@ pub fn search_feature(name: Option<String>, path: Option<String>) {
         Some(feature_name) => parser
             .features
             .iter()
-            .filter(|f| f.name.to_lowercase() == feature_name.to_lowercase())
-            .map(|f| f.clone())
+            .filter(|f| f.name.to_lowercase() == feature_name.to_lowercase()).cloned()
             .collect::<Vec<Feature>>(),
     };
 

cli/src/command/watch.rs

@@ -1,7 +1,7 @@
 use crate::analyser::Analyser;
 use crate::formatter::{default, info};
 use notify::event::ModifyKind;
-use notify::{Event, EventKind, RecursiveMode, Watcher, recommended_watcher};
+use notify::{EventKind, RecursiveMode, Watcher, recommended_watcher};
 use std::sync::mpsc::channel;
 use std::time::{Duration, Instant};
 
@@ -27,16 +27,15 @@ pub async fn watch_for_changes(path: Option<String>) {
     loop {
         if let Ok(Ok(event)) = rx.recv() {
             match event.kind {
-                EventKind::Modify(modify) => if let  ModifyKind::Data(_) = modify {
-                    if last_run.elapsed() > Duration::from_millis(500) {
+                EventKind::Modify(modify) => if let  ModifyKind::Data(_) = modify
+                    && last_run.elapsed() > Duration::from_millis(500) {
                         default(String::from(
                             "\n\n\n--------------------------------------------------------------------------\n\n",
                         ));
                         info(String::from("Change detected! Regenerating report..."));
                         Analyser::new(dir_path.as_str()).report(false);
                         last_run = Instant::now();
-                    }
-                },
+                    },
                 EventKind::Remove(_) => {
                     if last_run.elapsed() > Duration::from_millis(500) {
                         default(String::from(

cli/src/formatter.rs

@@ -55,7 +55,7 @@ where
 }
 
 pub fn warning(string: String, path: &String) -> String {
-    format!("\n{}: {} {}", "warning".yellow(), string, print_path(&path))
+    format!("\n{}: {} {}", "warning".yellow(), string, print_path(path))
 }
 
 pub fn warning_highlight(highlight: String, string: String) {