ref: cargo fmt

Author: raphael-goetz

crates/cli/src/analyser/diagnostics.rs

@@ -1,8 +1,8 @@
 use crate::formatter::{error, warning};
+use crate::parser::Meta;
 use std::cmp::PartialEq;
 use std::path::Path;
 use std::process::exit;
-use crate::parser::Meta;
 
 #[derive(Default)]
 pub struct Reporter {

crates/cli/src/analyser/mod.rs

@@ -6,11 +6,11 @@ use crate::analyser::diagnostics::DiagnosticKind::{
     UndefinedGenericKey, UndefinedTranslation, UnusedGenericKey,
 };
 use crate::analyser::diagnostics::{Diagnose, DiagnosticKind, Reporter};
+use crate::parser::Parser;
+use crate::parser::{Meta, MetaType, Reader};
 use tucana::shared::data_type_identifier::Type;
 use tucana::shared::definition_data_type_rule::Config;
 use tucana::shared::{DataTypeIdentifier, DefinitionDataType, FlowType, RuntimeFunctionDefinition};
-use crate::parser::Parser;
-use crate::parser::{Meta, MetaType, Reader};
 
 #[derive(Clone)]
 pub struct AnalysableDataType {

crates/cli/src/command/bundle.rs

@@ -1,7 +1,7 @@
+use crate::parser::Parser;
 use prost::Message;
 use std::fs;
 use std::io::Write;
-use crate::parser::Parser;
 
 pub fn bundle(path: Option<String>, out: Option<String>) {
     let dir_path = path.unwrap_or_else(|| "./definitions".to_string());

crates/cli/src/command/definition.rs

@@ -1,6 +1,6 @@
 use crate::formatter::{info, success};
-use colored::Colorize;
 use crate::parser::Parser;
+use colored::Colorize;
 
 pub fn search_definition(name: String, path: Option<String>) {
     let dir_path = path.unwrap_or_else(|| "./definitions".to_string());

crates/cli/src/parser.rs

@@ -1,11 +1,11 @@
 use serde::Serialize;
-use tucana::shared::{DefinitionDataType, FlowType, RuntimeFunctionDefinition};
 use std::io::ErrorKind;
 use std::{
     fs::{self, DirEntry},
     io::Error,
     path::Path,
 };
+use tucana::shared::{DefinitionDataType, FlowType, RuntimeFunctionDefinition};
 
 #[derive(Serialize, Clone, Debug)]
 pub struct DefinitionError {
@@ -128,7 +128,6 @@ impl Parser {
     }
 }
 
-
 #[derive(Serialize, Debug, Clone, Copy)]
 pub enum MetaType {
     FlowType,
@@ -291,4 +290,3 @@ fn get_file_name(entry: &DirEntry) -> Option<String> {
         .to_str()
         .map(|file_name| file_name.to_string())
 }
-

crates/cli/src/table.rs

@@ -1,6 +1,6 @@
+use crate::parser::Feature;
 use tabled::Tabled;
 use tucana::shared::{DefinitionDataType, FlowType, RuntimeFunctionDefinition};
-use crate::parser::Feature;
 
 #[derive(Tabled)]
 pub struct FlowTypeRow {

crates/package/src/lib.rs

@@ -1,12 +1,12 @@
 pub mod package {
     use serde::Serialize;
-    use tucana::shared::{DefinitionDataType, FlowType, RuntimeFunctionDefinition};
     use std::io::ErrorKind;
     use std::{
         fs::{self, DirEntry},
         io::Error,
         path::Path,
     };
+    use tucana::shared::{DefinitionDataType, FlowType, RuntimeFunctionDefinition};
 
     #[derive(Serialize, Clone, Debug)]
     pub struct DefinitionError {
@@ -96,14 +96,16 @@ pub mod package {
         fn append_meta(feature: &mut Feature, meta: &Meta) {
             let definition = meta.definition_string.as_str();
             match meta.r#type {
-                MetaType::DataType => match serde_json::from_str::<DefinitionDataType>(definition) {
-                    Ok(data_type) => feature.data_types.push(data_type),
-                    Err(err) => feature.errors.push(DefinitionError {
-                        definition: Parser::extract_identifier(definition, MetaType::DataType),
-                        definition_type: MetaType::DataType,
-                        error: err.to_string(),
-                    }),
-                },
+                MetaType::DataType => {
+                    match serde_json::from_str::<DefinitionDataType>(definition) {
+                        Ok(data_type) => feature.data_types.push(data_type),
+                        Err(err) => feature.errors.push(DefinitionError {
+                            definition: Parser::extract_identifier(definition, MetaType::DataType),
+                            definition_type: MetaType::DataType,
+                            error: err.to_string(),
+                        }),
+                    }
+                }
                 MetaType::FlowType => match serde_json::from_str::<FlowType>(definition) {
                     Ok(flow_type) => feature.flow_types.push(flow_type),
                     Err(err) => feature.errors.push(DefinitionError {
@@ -129,7 +131,6 @@ pub mod package {
         }
     }
 
-
     #[derive(Serialize, Debug, Clone, Copy)]
     pub enum MetaType {
         FlowType,
@@ -160,7 +161,11 @@ pub mod package {
     }
 
     impl Meta {
-        pub fn read_from_file<P>(name: String, r#type: MetaType, file_path: P) -> Result<Meta, Error>
+        pub fn read_from_file<P>(
+            name: String,
+            r#type: MetaType,
+            file_path: P,
+        ) -> Result<Meta, Error>
         where
             P: AsRef<Path>,
         {
@@ -292,6 +297,4 @@ pub mod package {
             .to_str()
             .map(|file_name| file_name.to_string())
     }
-
-
-}
+}