clippy and tests

Author: sxlijin

engine/baml-lib/baml/tests/bytecode_files/loops/c_for.baml

@@ -59,9 +59,9 @@ function Nothing() -> int {
 // 4   8    LOAD_VAR 2          (i)
 //     9    BIN_OP +            
 //     10   STORE_VAR 1         (s)
-//     11   LOAD_VAR 2          (i)
 //
-// 3   12   LOAD_CONST 3        (1)
+// 3   11   LOAD_VAR 2          (i)
+//     12   LOAD_CONST 3        (1)
 //     13   BIN_OP +            
 //     14   STORE_VAR 2         (i)
 //     15   JUMP -13            (to 2)
@@ -98,9 +98,9 @@ function Nothing() -> int {
 //      19   JUMP +3            (to 22)
 //      20   JUMP +2            (to 22)
 //      21   POP 1              
-//      22   LOAD_VAR 1         (s)
 //
-// 13   23   LOAD_VAR 2         (i)
+// 13   22   LOAD_VAR 1         (s)
+//      23   LOAD_VAR 2         (i)
 //      24   BIN_OP +           
 //      25   STORE_VAR 1        (s)
 //      26   JUMP -24           (to 2)

engine/baml-lib/baml/tests/hir_files/loops/c_for.baml

@@ -50,7 +50,9 @@ function Nothing() -> int {
 //   let s = 0;
 //   {
 //   let i = 1;
-//     for (;i <= 10;i += 1;) { s += i;}
+//     for (;i <= 10;{
+//     i += 1;
+//     }) { s += i;}
 //   }
 //
 //   s
@@ -60,7 +62,9 @@ function Nothing() -> int {
 //   let s = 0;
 //   {
 //   let i = 0;
-//     for (;;s += i;) { }
+//     for (;;{
+//     s += i;
+//     }) { }
 //   }
 //
 //   s

engine/baml-runtime/src/control_flow.rs

@@ -136,7 +136,7 @@ impl ControlFlowVizBuilder {
     }
 
     fn add_node(&mut self, node: Node) {
-        self.nodes.insert(node.id.clone(), node);
+        self.nodes.insert(node.id, node);
     }
 
     fn add_edge(&mut self, src: NodeId, dst: NodeId) {
@@ -146,7 +146,7 @@ impl ControlFlowVizBuilder {
     fn finish(self) -> ControlFlowVisualization {
         let mut edges_by_src: IndexMap<NodeId, Vec<Edge>> = IndexMap::new();
         for edge in self.edges {
-            edges_by_src.entry(edge.src.clone()).or_default().push(edge);
+            edges_by_src.entry(edge.src).or_default().push(edge);
         }
 
         ControlFlowVisualization {
@@ -463,7 +463,7 @@ impl HirTraversalContext {
         let lexical_id = self.build_lexical_id(&segment);
         let node_id = self.graph.allocate_id();
         let parent_id = self.current_parent_id();
-        let node_label = label.unwrap_or_else(|| "".to_string());
+        let node_label = label.unwrap_or_default();
         let node = Node::new(
             node_id,
             parent_id,
@@ -769,10 +769,10 @@ impl HirTraversalContext {
         if !parent_entry {
             return;
         }
-        if let Some(prev) = self.frames[parent_index].last_linear_child.clone() {
-            self.graph.add_edge(prev, node_id.clone());
+        if let Some(prev) = self.frames[parent_index].last_linear_child {
+            self.graph.add_edge(prev, *node_id);
         }
-        self.frames[parent_index].last_linear_child = Some(node_id.clone());
+        self.frames[parent_index].last_linear_child = Some(*node_id);
     }
 
     fn pop_headers_to_level(&mut self, desired_level: u8) {

engine/baml-runtime/src/control_flow/mermaid.rs

@@ -20,40 +20,34 @@ impl<'a> MermaidRenderer<'a> {
     fn new(viz: &'a ControlFlowVisualization) -> Self {
         let mut aliases = HashMap::new();
         for (idx, node) in viz.nodes.values().enumerate() {
-            aliases.insert(node.id.clone(), format!("n{idx}"));
+            aliases.insert(node.id, format!("n{idx}"));
         }
 
         let mut roots = Vec::new();
         let mut children: HashMap<NodeId, Vec<NodeId>> = HashMap::new();
         for node in viz.nodes.values() {
             if let Some(parent) = &node.parent_node_id {
-                children
-                    .entry(parent.clone())
-                    .or_default()
-                    .push(node.id.clone());
+                children.entry(*parent).or_default().push(node.id);
             } else {
-                roots.push(node.id.clone());
+                roots.push(node.id);
             }
         }
 
         let mut edges_by_parent: HashMap<NodeId, Vec<(NodeId, NodeId)>> = HashMap::new();
         let mut root_edges = Vec::new();
         for (src_id, list) in &viz.edges_by_src {
-            let parent = viz
-                .nodes
-                .get(src_id)
-                .and_then(|node| node.parent_node_id.clone());
+            let parent = viz.nodes.get(src_id).and_then(|node| node.parent_node_id);
 
             match parent {
                 Some(parent_id) => {
                     let entry = edges_by_parent.entry(parent_id).or_default();
                     for edge in list {
-                        entry.push((src_id.clone(), edge.dst.clone()));
+                        entry.push((*src_id, edge.dst));
                     }
                 }
                 None => {
                     for edge in list {
-                        root_edges.push((src_id.clone(), edge.dst.clone()));
+                        root_edges.push((*src_id, edge.dst));
                     }
                 }
             }

engine/baml-runtime/src/lib.rs

@@ -2047,7 +2047,7 @@ impl InternalRuntimeInterface for BamlRuntime {
         _ctx: &RuntimeContext,
     ) -> Result<ControlFlowVisualization> {
         let ast = self.db.ast();
-        let hir = hir::Hir::from_ast(&ast);
+        let hir = hir::Hir::from_ast(ast);
         let viz = build_from_hir(&hir, function_name)?;
         Ok(flatten_control_flow(&viz).into())
     }