cargo clippy & fmt

Author: ghaith

src/codegen/tests.rs

@@ -11,10 +11,10 @@ mod function_tests;
 mod generics_test;
 mod initialization_test;
 mod multifile_codegen_tests;
+mod online_change_tests;
 mod parameters_tests;
 mod statement_codegen_test;
 mod string_tests;
-mod online_change_tests;
 #[cfg(feature = "verify")]
 mod switch_case_tests;
 mod typesystem_test;

src/codegen/tests/online_change_tests.rs

@@ -4,13 +4,15 @@ use crate::test_utils::tests::codegen_with_online_change as codegen;
 
 #[test]
 fn generate_function_with_online_change() {
-    let src = codegen("
+    let src = codegen(
+        "
         FUNCTION foo : DINT
            VAR
             x : DINT;
            END_VAR
         END_FUNCTION
-        ");
+        ",
+    );
     assert_snapshot!(src, @r###"
     ; ModuleID = '<internal>'
     source_filename = "<internal>"
@@ -40,13 +42,15 @@ fn generate_function_with_online_change() {
 
 #[test]
 fn generate_program_with_online_change() {
-    let src = codegen("
+    let src = codegen(
+        "
         PROGRAM prg
            VAR
             x : DINT;
            END_VAR
         END_PROGRAM
-        ");
+        ",
+    );
     assert_snapshot!(src, @r###"
     ; ModuleID = '<internal>'
     source_filename = "<internal>"
@@ -100,7 +104,8 @@ fn generate_program_with_online_change() {
 
 #[test]
 fn generate_program_and_var_with_online_change() {
-    let src = codegen("
+    let src = codegen(
+        "
         PROGRAM prg
            VAR
             x : DINT;
@@ -110,7 +115,8 @@ fn generate_program_and_var_with_online_change() {
         VAR_GLOBAL
             gV : DINT;
         END_VAR
-        ");
+        ",
+    );
     assert_snapshot!(src, @r###"
     ; ModuleID = '<internal>'
     source_filename = "<internal>"
@@ -168,7 +174,8 @@ fn generate_program_and_var_with_online_change() {
 
 #[test]
 fn generate_function_and_var_with_online_change() {
-    let src = codegen("
+    let src = codegen(
+        "
         FUNCTION foo : DINT
            VAR
             x : DINT;
@@ -178,7 +185,8 @@ fn generate_function_and_var_with_online_change() {
         VAR_GLOBAL
             gV : DINT;
         END_VAR
-        ");
+        ",
+    );
     assert_snapshot!(src, @r###"
     ; ModuleID = '<internal>'
     source_filename = "<internal>"

src/test_utils.rs

@@ -14,10 +14,18 @@ pub mod tests {
     use plc_source::{source_location::SourceLocationFactory, Compilable, SourceCode, SourceContainer};
 
     use crate::{
-        builtins, codegen::{CodegenContext, GeneratedModule}, index::{self, FxIndexSet, Index}, lexer, lowering::AstLowerer, parser, resolver::{
+        builtins,
+        codegen::{CodegenContext, GeneratedModule},
+        index::{self, FxIndexSet, Index},
+        lexer,
+        lowering::AstLowerer,
+        parser,
+        resolver::{
             const_evaluator::evaluate_constants, AnnotationMapImpl, AstAnnotations, Dependency,
             StringLiterals, TypeAnnotator,
-        }, typesystem::get_builtin_types, DebugLevel, OnlineChange, Validator
+        },
+        typesystem::get_builtin_types,
+        DebugLevel, OnlineChange, Validator,
     };
 
     pub fn parse(src: &str) -> (CompilationUnit, Vec<Diagnostic>) {
@@ -188,7 +196,12 @@ pub mod tests {
     }
 
     pub fn codegen_with_online_change(src: &str) -> String {
-        codegen_debug_without_unwrap_oc(src, DebugLevel::None, OnlineChange::Enabled{ file_name: "test".into(), format: crate::ConfigFormat::JSON }).unwrap()
+        codegen_debug_without_unwrap_oc(
+            src,
+            DebugLevel::None,
+            OnlineChange::Enabled { file_name: "test".into(), format: crate::ConfigFormat::JSON },
+        )
+        .unwrap()
     }
 
     pub fn codegen_debug_without_unwrap(src: &str, debug_level: DebugLevel) -> Result<String, String> {
@@ -199,7 +212,11 @@ pub mod tests {
     /// reported diagnostics. Therefor the return value of this method is always a tuple.
     /// TODO: This should not be so, we should have a diagnostic type that holds multiple new
     /// issues.
-    pub fn codegen_debug_without_unwrap_oc(src: &str, debug_level: DebugLevel, online_change: OnlineChange) -> Result<String, String> {
+    pub fn codegen_debug_without_unwrap_oc(
+        src: &str,
+        debug_level: DebugLevel,
+        online_change: OnlineChange,
+    ) -> Result<String, String> {
         let mut reporter = Diagnostician::buffered();
         reporter.register_file("<internal>".to_string(), src.to_string());
         let mut id_provider = IdProvider::default();