fmt fixes

Author: rachitnigam

.gitignore

@@ -27,6 +27,7 @@ __pycache__
 aetherling/base
 book/
 evaluation/iterative-divider/data.json
+*.swp
 
 # Prevents editing vscode extensions further
-/.vscode/settings.json
+/.vscode/settings.json

crates/ast/src/lib.rs

@@ -23,7 +23,7 @@ pub use fil_utils::Id;
 pub use implication::Implication;
 pub use interval::Range;
 pub use loc::Loc;
-pub use parser::{FilamentParser, FCons};
+pub use parser::{FCons, FilamentParser};
 pub use port::{InterfaceDef, PortDef};
 pub use signature::{EventBind, ParamBind, SigBind, Signature};
 pub use time::{Time, TimeSub};

crates/filament/src/ast_passes/desugar_conditionals.rs

@@ -14,15 +14,16 @@ impl Visitor for DesugarConditionals {
     fn signature(&mut self, sig: &mut ast::Signature) -> Action {
         // Process conditional constraints and convert them to facts
         let mut new_facts = Vec::new();
-        
+
         for conditional_constraint in &sig.conditional_constraints {
-            let facts = self.desugar_conditional_constraint(conditional_constraint);
+            let facts =
+                self.desugar_conditional_constraint(conditional_constraint);
             new_facts.extend(facts);
         }
-        
+
         // Clear the conditional constraints since we've processed them
         sig.conditional_constraints.clear();
-        
+
         if !new_facts.is_empty() {
             Action::AddBefore(new_facts)
         } else {
@@ -32,25 +33,38 @@ impl Visitor for DesugarConditionals {
 }
 
 impl DesugarConditionals {
-    fn desugar_conditional_constraint(&self, constraint: &Loc<ast::FCons>) -> Vec<ast::Command> {
+    fn desugar_conditional_constraint(
+        &self,
+        constraint: &Loc<ast::FCons>,
+    ) -> Vec<ast::Command> {
         use ast::FCons;
-        
+
         match &**constraint {
-            FCons::ConditionalC { condition, then_constraint, else_constraint } => {
+            FCons::ConditionalC {
+                condition,
+                then_constraint,
+                else_constraint,
+            } => {
                 let mut facts = Vec::new();
-                
+
                 // Create: assume condition => then_constraint
-                if let Some(then_fact) = self.create_assume_fact(condition.clone(), then_constraint) {
+                if let Some(then_fact) =
+                    self.create_assume_fact(condition.clone(), then_constraint)
+                {
                     facts.push(ast::Command::Fact(then_fact));
                 }
-                
-                // Create: assume !condition => else_constraint  
-                if let Some(negated_condition) = self.negate_condition(condition) {
-                    if let Some(else_fact) = self.create_assume_fact(negated_condition, else_constraint) {
+
+                // Create: assume !condition => else_constraint
+                if let Some(negated_condition) =
+                    self.negate_condition(condition)
+                {
+                    if let Some(else_fact) = self
+                        .create_assume_fact(negated_condition, else_constraint)
+                    {
                         facts.push(ast::Command::Fact(else_fact));
                     }
                 }
-                
+
                 facts
             }
             _ => {
@@ -59,25 +73,28 @@ impl DesugarConditionals {
             }
         }
     }
-    
+
     fn create_assume_fact(
-        &self, 
-        condition: ast::OrderConstraint<ast::Expr>, 
-        constraint: &Box<ast::FCons>
+        &self,
+        condition: ast::OrderConstraint<ast::Expr>,
+        constraint: &ast::FCons,
     ) -> Option<ast::Fact> {
-        // Convert FCons to OrderConstraint  
+        // Convert FCons to OrderConstraint
         let constraint_oc = self.fcons_to_order_constraint(constraint)?;
-        
+
         // Create implication: condition => constraint
         let implication = ast::Implication::implies(condition, constraint_oc);
-        
+
         // Create assume fact
         Some(ast::Fact::assume(Loc::unknown(implication)))
     }
-    
-    fn fcons_to_order_constraint(&self, fcons: &ast::FCons) -> Option<ast::OrderConstraint<ast::Expr>> {
+
+    fn fcons_to_order_constraint(
+        &self,
+        fcons: &ast::FCons,
+    ) -> Option<ast::OrderConstraint<ast::Expr>> {
         use ast::FCons;
-        
+
         match fcons {
             FCons::ExprC(oc) => Some(oc.clone()),
             FCons::TimeC(_) => {
@@ -92,19 +109,28 @@ impl DesugarConditionals {
             }
         }
     }
-    
-    fn negate_condition(&self, condition: &ast::OrderConstraint<ast::Expr>) -> Option<ast::OrderConstraint<ast::Expr>> {
+
+    fn negate_condition(
+        &self,
+        condition: &ast::OrderConstraint<ast::Expr>,
+    ) -> Option<ast::OrderConstraint<ast::Expr>> {
         use ast::OrderOp;
-        
+
         // For now, only handle simple negations
         match condition.op {
             OrderOp::Gt => {
                 // !(a > b) becomes (a <= b), which is (b >= a)
-                Some(ast::OrderConstraint::gte(condition.right.clone(), condition.left.clone()))
+                Some(ast::OrderConstraint::gte(
+                    condition.right.clone(),
+                    condition.left.clone(),
+                ))
             }
             OrderOp::Gte => {
-                // !(a >= b) becomes (a < b), which is (b > a)  
-                Some(ast::OrderConstraint::gt(condition.right.clone(), condition.left.clone()))
+                // !(a >= b) becomes (a < b), which is (b > a)
+                Some(ast::OrderConstraint::gt(
+                    condition.right.clone(),
+                    condition.left.clone(),
+                ))
             }
             OrderOp::Eq => {
                 // !(a == b) is more complex - we can't easily represent != in the constraint system
@@ -113,4 +139,4 @@ impl DesugarConditionals {
             }
         }
     }
-}
+}

crates/filament/src/ast_passes/mod.rs

@@ -1,5 +1,5 @@
-mod toplevel;
 mod desugar_conditionals;
+mod toplevel;
 
-pub use toplevel::TopLevel;
 pub use desugar_conditionals::DesugarConditionals;
+pub use toplevel::TopLevel;