formatting

Author: enola-dkfz

src/cql.rs

@@ -61,7 +61,10 @@ fn generate_cql(ast: ast::Ast, cql_flavour: Flavour) -> Result<String, FocusErro
         lists += format!(
             "codesystem {}: '{}'\n",
             code_system,
-            cql_flavour.get_code_lists().get(code_system).unwrap_or(&(""))
+            cql_flavour
+                .get_code_lists()
+                .get(code_system)
+                .unwrap_or(&(""))
         )
         .as_str();
     }
@@ -294,12 +297,14 @@ pub fn process(
 
                     match condition.value {
                         ast::ConditionValue::StringArray(string_array) => {
-                            let mut string_array_with_workarounds= if *cql_flavour == Flavour::Miabis { //empty, codes get replaced
-                                Default::default()
-                            } else {
-                                string_array.clone()
-                            };
-                            
+                            let mut string_array_with_workarounds =
+                                if *cql_flavour == Flavour::Miabis {
+                                    //empty, codes get replaced
+                                    Default::default()
+                                } else {
+                                    string_array.clone()
+                                };
+
                             for value in string_array {
                                 if let Some(additional_values) =
                                     cql_flavour.get_code_workarounds().get(value.as_str())
@@ -350,8 +355,7 @@ pub fn process(
                 ast::ConditionType::Equals => match condition.value {
                     ast::ConditionValue::String(string) => {
                         let operator_str = " or ";
-                        let mut string_array_with_workarounds = 
-                        vec![string.clone()];
+                        let mut string_array_with_workarounds = vec![string.clone()];
                         if let Some(additional_values) =
                             cql_flavour.get_code_workarounds().get(string.as_str())
                         {

src/flavours/miabis/mod.rs

@@ -6,32 +6,21 @@ use indexmap::IndexSet;
 
 use super::CriterionRole;
 
-pub static CODE_LISTS: LazyLock<HashMap<&'static str, &'static str>> =     
-    LazyLock::new(|| {
-        HashMap::new() 
-    });
+pub static CODE_LISTS: LazyLock<HashMap<&'static str, &'static str>> =
+    LazyLock::new(|| HashMap::new());
 
 pub static OBSERVATION_LOINC_CODES: LazyLock<HashMap<&'static str, &'static str>> =
-        LazyLock::new(|| {
-        HashMap::new() 
-    });
+    LazyLock::new(|| HashMap::new());
 
 pub static CRITERION_CODE_LISTS: LazyLock<HashMap<&'static str, Vec<&'static str>>> =
-        LazyLock::new(|| {
-        HashMap::new() 
-    });
+    LazyLock::new(|| HashMap::new());
 
 pub static CQL_SNIPPETS: LazyLock<HashMap<(&'static str, CriterionRole), &'static str>> =
-        LazyLock::new(|| {
-        HashMap::new() 
-    });
+    LazyLock::new(|| HashMap::new());
 
 pub static MANDATORY_CODE_LISTS: LazyLock<IndexSet<&'static str>> =
-        LazyLock::new(|| {
-        IndexSet::new() 
-    });
-
-pub static CODE_WORKAROUNDS: LazyLock<HashMap<&'static str, Vec<&'static str>>> = // both sample type and storage temperature replacement codes
-        LazyLock::new(|| {
-        HashMap::new() 
-    });
+    LazyLock::new(|| IndexSet::new());
+
+pub static CODE_WORKAROUNDS: LazyLock<HashMap<&'static str, Vec<&'static str>>> =
+    // both sample type and storage temperature replacement codes
+    LazyLock::new(|| HashMap::new());

src/flavours/mod.rs

@@ -9,9 +9,9 @@ mod cce;
 mod dhki;
 mod dktk;
 mod itcc;
+mod miabis;
 mod nngm;
 mod pscc;
-mod miabis;
 
 #[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Hash, Copy)]
 pub enum CriterionRole {
@@ -20,15 +20,16 @@ pub enum CriterionRole {
 }
 
 #[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy)]
-pub enum Flavour { //not 1:1 with project anymore
+pub enum Flavour {
+    //not 1:1 with project anymore
     Bbmri,
     Dktk,
     Cce,
     Dhki,
     Nngm,
     Itcc,
     Pscc,
-    Miabis
+    Miabis,
 }
 
 impl FromStr for Flavour {
@@ -76,7 +77,8 @@ impl Flavour {
         }
     }
 
-    pub fn get_code_workarounds(&self) -> &'static HashMap<&'static str, Vec<&'static str>> { // used for all code workarounds, different criteria do not contain overlapping codes
+    pub fn get_code_workarounds(&self) -> &'static HashMap<&'static str, Vec<&'static str>> {
+        // used for all code workarounds, different criteria do not contain overlapping codes
         match self {
             Flavour::Bbmri => &bbmri::CODE_WORKAROUNDS,
             Flavour::Dktk => &dktk::CODE_WORKAROUNDS,

src/main.rs

@@ -11,9 +11,9 @@ mod logger;
 mod eucaim_api;
 mod eucaim_beacon;
 mod exporter;
+mod flavours;
 mod intermediate_rep;
 mod mr;
-mod flavours;
 mod task_processing;
 mod transformed;
 mod util;
@@ -330,7 +330,8 @@ async fn process_task(
                 }
                 Language::Ast(ast_query) => {
                     generated_from_ast = true;
-                    let cql_flavour = if let Some(cql_flavour) = &CONFIG.cql_flavour { //same FEs query blazes with different FHIR profiles
+                    let cql_flavour = if let Some(cql_flavour) = &CONFIG.cql_flavour {
+                        //same FEs query blazes with different FHIR profiles
                         cql_flavour
                     } else {
                         &metadata.project