fmt

Author: tcoratger

crates/lean_compiler/src/analysis/ssa.rs

@@ -1,7 +1,7 @@
 //! SSA (Static Single Assignment) analysis utilities.
 
-use crate::lang::{Line, Expression, Boolean, Var};
 use super::visitors::{Visitor, VisitorResult};
+use crate::lang::{Boolean, Expression, Line, Var};
 use std::collections::{HashMap, HashSet};
 
 /// Tracks variable assignments to detect SSA violations
@@ -131,7 +131,12 @@ impl ReturnContextCollector {
         collector.contexts
     }
 
-    fn collect_recursive(&mut self, lines: &[Line], return_vars: &[Var], current_conditions: Vec<Boolean>) {
+    fn collect_recursive(
+        &mut self,
+        lines: &[Line],
+        return_vars: &[Var],
+        current_conditions: Vec<Boolean>,
+    ) {
         for line in lines {
             match line {
                 Line::Assignment { var, value } if return_vars.contains(var) => {
@@ -141,7 +146,11 @@ impl ReturnContextCollector {
                     };
                     self.contexts.push(context);
                 }
-                Line::IfCondition { condition, then_branch, else_branch } => {
+                Line::IfCondition {
+                    condition,
+                    then_branch,
+                    else_branch,
+                } => {
                     // Collect from then branch with added condition
                     let mut then_conditions = current_conditions.clone();
                     then_conditions.push(condition.clone());
@@ -234,7 +243,7 @@ pub fn create_ssa_repair_strategy(contexts: &[ReturnContext]) -> Vec<Line> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::lang::{SimpleExpr, ConstExpression};
+    use crate::lang::{ConstExpression, SimpleExpr};
 
     #[test]
     fn test_ssa_analyzer_no_violations() {
@@ -273,12 +282,10 @@ mod tests {
 
     #[test]
     fn test_return_context_collection() {
-        let lines = vec![
-            Line::Assignment {
-                var: "result".to_string(),
-                value: Expression::Value(SimpleExpr::Constant(ConstExpression::scalar(42))),
-            },
-        ];
+        let lines = vec![Line::Assignment {
+            var: "result".to_string(),
+            value: Expression::Value(SimpleExpr::Constant(ConstExpression::scalar(42))),
+        }];
 
         let return_vars = vec!["result".to_string()];
         let contexts = ReturnContextCollector::collect_from(&lines, &return_vars);
@@ -296,12 +303,10 @@ mod tests {
                     left: Expression::Value(SimpleExpr::Constant(ConstExpression::scalar(1))),
                     right: Expression::Value(SimpleExpr::Constant(ConstExpression::scalar(1))),
                 },
-                then_branch: vec![
-                    Line::Assignment {
-                        var: "result".to_string(),
-                        value: Expression::Value(SimpleExpr::Constant(ConstExpression::scalar(100))),
-                    }
-                ],
+                then_branch: vec![Line::Assignment {
+                    var: "result".to_string(),
+                    value: Expression::Value(SimpleExpr::Constant(ConstExpression::scalar(100))),
+                }],
                 else_branch: vec![],
             },
             Line::Assignment {
@@ -313,4 +318,4 @@ mod tests {
         let return_vars = vec!["result".to_string()];
         assert!(detect_return_ssa_violations(&lines, &return_vars));
     }
-}
+}

crates/lean_compiler/src/codegen/compiler.rs

@@ -81,8 +81,8 @@ impl Compiler {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::lang::SimpleExpr;
     use crate::ir::{SimpleFunction, SimpleLine, VarOrConstMallocAccess};
+    use crate::lang::SimpleExpr;
 
     #[test]
     fn test_compiler_creation() {

crates/lean_compiler/src/codegen/function.rs

@@ -45,8 +45,8 @@ pub fn compile_function(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::lang::SimpleExpr;
     use crate::ir::VarOrConstMallocAccess;
+    use crate::lang::SimpleExpr;
 
     #[test]
     fn test_compile_simple_function() {

crates/lean_compiler/src/codegen/memory.rs

@@ -1,4 +1,4 @@
-use crate::{lang::*, ir::*};
+use crate::{ir::*, lang::*};
 use std::collections::BTreeSet;
 
 /// Finds all internal variables declared within a set of instructions.
@@ -59,8 +59,8 @@ pub fn find_internal_vars(lines: &[SimpleLine]) -> BTreeSet<Var> {
 mod tests {
     use super::*;
     use crate::ir::HighLevelOperation;
-    use crate::lang::{ConstExpression, SimpleExpr};
     use crate::ir::VarOrConstMallocAccess;
+    use crate::lang::{ConstExpression, SimpleExpr};
 
     #[test]
     fn test_find_internal_vars_empty() {

crates/lean_compiler/src/ir/conversion.rs

@@ -764,8 +764,8 @@ fn create_recursive_function(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{ir::HighLevelOperation, lang::*};
     use crate::ir::types::*;
+    use crate::{ir::HighLevelOperation, lang::*};
 
     fn create_test_counters() -> Counters {
         Counters::default()

crates/lean_compiler/src/ir/mod.rs

@@ -17,12 +17,7 @@ pub use value::{IntermediaryMemOrFpOrConstant, IntermediateValue};
 
 // High-level IR exports (AST to IR)
 pub use types::{
-    ArrayManager,
-    ConstMalloc,
-    Counters,
-    SimpleFunction,
-    SimpleLine,
-    SimpleProgram,
+    ArrayManager, ConstMalloc, Counters, SimpleFunction, SimpleLine, SimpleProgram,
     VarOrConstMallocAccess,
 };
 

crates/lean_compiler/src/ir/value.rs

@@ -140,8 +140,8 @@ impl Display for IntermediaryMemOrFpOrConstant {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::lang::{ConstExpression, SimpleExpr};
     use crate::ir::VarOrConstMallocAccess;
+    use crate::lang::{ConstExpression, SimpleExpr};
     use lean_vm::Label;
 
     #[test]