lint(all): lint

hanmindev · Feb 8, 2024 · e003570 · e003570
1 parent e05d339
commit e003570
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 30 deletions.
diff --git a/src/front/mergers/convert.rs b/src/front/mergers/convert.rs
@@ -7,7 +7,7 @@ use crate::front::ast_types::{
 use crate::front::mergers::convert::context::Context;
 use crate::front::mergers::definition_table::DefinitionTable;
 use crate::middle::format::ir_types::{
-    Address, CheckVal, CompareOp, CompareVal, Cond, IrBlock, IrFnCall, IrFnDef, IrIf,
+    Address, CheckVal, Cond, IrBlock, IrFnCall, IrFnDef, IrIf,
     IrScoreOperation, IrScoreOperationType, IrScoreSet, IrStatement, IrUnless,
 };
 use crate::middle::format::types::GlobalName;
@@ -622,17 +622,20 @@ mod tests {
 
         let mut program = program_merger.export_program();
 
-        assert_eq!(test_calculation(
-            &program
-                .function_definitions
-                .get("pkg/root/0_main")
-                .unwrap()
-                .body,
-            &Address {
-                name: AddressOrigin::User("pkg/root/0_b".to_string()),
-                offset: 0,
-            },
-        ), 11);
+        assert_eq!(
+            test_calculation(
+                &program
+                    .function_definitions
+                    .get("pkg/root/0_main")
+                    .unwrap()
+                    .body,
+                &Address {
+                    name: AddressOrigin::User("pkg/root/0_b".to_string()),
+                    offset: 0,
+                },
+            ),
+            11
+        );
     }
 
     #[test]
@@ -649,16 +652,19 @@ mod tests {
 
         let mut program = program_merger.export_program();
 
-        assert_eq!(test_calculation(
-            &program
-                .function_definitions
-                .get("pkg/root/0_main")
-                .unwrap()
-                .body,
-            &Address {
-                name: AddressOrigin::User("pkg/root/0_a".to_string()),
-                offset: 0,
-            },
-        ), 25);
+        assert_eq!(
+            test_calculation(
+                &program
+                    .function_definitions
+                    .get("pkg/root/0_main")
+                    .unwrap()
+                    .body,
+                &Address {
+                    name: AddressOrigin::User("pkg/root/0_a".to_string()),
+                    offset: 0,
+                },
+            ),
+            25
+        );
     }
 }
diff --git a/src/front/mergers/convert/context.rs b/src/front/mergers/convert/context.rs
@@ -1,9 +1,9 @@
-use std::cmp::Reverse;
-use std::collections::{BinaryHeap, HashSet};
 use crate::front::ast_types::{GlobalResolvedName, NamePath, Reference};
 use crate::front::mergers::convert::global_name_updater;
 use crate::front::mergers::definition_table::DefinitionTable;
 use crate::middle::format::ir_types::{Address, AddressOrigin};
+use std::cmp::Reverse;
+use std::collections::{BinaryHeap, HashSet};
 use std::rc::Rc;
 
 struct VarGenerator {
@@ -59,7 +59,6 @@ impl ConstGenerator {
     }
 }
 
-
 pub struct Context<'a> {
     pub fn_name: String,
     block_count: u32,
@@ -72,7 +71,7 @@ impl Context<'_> {
     pub fn new<'a>(
         fn_name: &str,
         definition_table: &'a DefinitionTable<Rc<GlobalResolvedName>>,
-        const_generator: &'a mut ConstGenerator
+        const_generator: &'a mut ConstGenerator,
     ) -> Context<'a> {
         Context {
             fn_name: fn_name.to_string(),

diff --git a/src/front/mergers/program.rs b/src/front/mergers/program.rs
@@ -1,13 +1,13 @@
 use crate::front::ast_retriever::retriever::FileRetriever;
 use crate::front::file_system::fs::FileSystem;
+use crate::front::mergers::convert::context::ConstGenerator;
 use crate::front::mergers::convert::{convert_fn, global_name_updater};
 use crate::front::mergers::definition_table::DefinitionTable;
 use crate::front::mergers::package::{Package, Packager};
 use crate::middle::format::types::Program;
 use std::collections::{HashMap, HashSet};
 use std::marker::PhantomData;
 use std::rc::Rc;
-use crate::front::mergers::convert::context::ConstGenerator;
 
 pub struct ProgramMerger<R> {
     root_package: String,

diff --git a/src/middle/format/ir_types.rs b/src/middle/format/ir_types.rs
@@ -134,10 +134,15 @@ impl IrBlock {
 
 impl std::fmt::Display for IrBlock {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        write!(f, "fn {} block {} {{\n", self.get_fn_name(), self.fn_block_index)?;
+        write!(
+            f,
+            "fn {} block {} {{\n",
+            self.get_fn_name(),
+            self.fn_block_index
+        )?;
         for statement in &self.statements {
             write!(f, "    {:?}\n", statement)?;
         }
         write!(f, "}}")
     }
-}
+}