clients: snapshot

crates/brk_bindgen/src/generators/rust/client.rs

@@ -3,9 +3,8 @@
 use std::fmt::Write;
 
 use crate::{
-    ClientMetadata, GenericSyntax, IndexSetPattern, PatternField, RustSyntax,
-    StructuralPattern, generate_parameterized_field, generate_tree_path_field,
-    index_to_field_name, to_snake_case,
+    ClientMetadata, GenericSyntax, IndexSetPattern, RustSyntax, StructuralPattern,
+    generate_parameterized_field, generate_tree_path_field, index_to_field_name, to_snake_case,
 };
 
 /// Generate import statements.
@@ -315,7 +314,7 @@ pub fn generate_pattern_structs(
         for field in &pattern.fields {
             let field_name = to_snake_case(&field.name);
             let type_annotation =
-                field_type_with_generic(field, metadata, pattern.is_generic, None);
+                metadata.field_type_annotation(field, pattern.is_generic, None, GenericSyntax::RUST);
             writeln!(output, "    pub {}: {},", field_name, type_annotation).unwrap();
         }
 
@@ -368,13 +367,3 @@ pub fn generate_pattern_structs(
         writeln!(output, "}}\n").unwrap();
     }
 }
-
-/// Get Rust type annotation for a field with optional generic value type.
-pub fn field_type_with_generic(
-    field: &PatternField,
-    metadata: &ClientMetadata,
-    is_generic: bool,
-    generic_value_type: Option<&str>,
-) -> String {
-    metadata.field_type_annotation(field, is_generic, generic_value_type, GenericSyntax::RUST)
-}

crates/brk_bindgen/src/generators/rust/tree.rs

@@ -6,13 +6,11 @@ use std::fmt::Write;
 use brk_types::TreeNode;
 
 use crate::{
-    ClientMetadata, LanguageSyntax, PatternField, RustSyntax, child_type_name,
+    ClientMetadata, GenericSyntax, LanguageSyntax, PatternField, RustSyntax, child_type_name,
     generate_leaf_field, generate_tree_node_field, get_node_fields, get_pattern_instance_base,
     prepare_tree_node, to_snake_case,
 };
 
-use super::client::field_type_with_generic;
-
 /// Generate tree structs.
 pub fn generate_tree(output: &mut String, catalog: &TreeNode, metadata: &ClientMetadata) {
     writeln!(output, "// Catalog tree\n").unwrap();
@@ -49,10 +47,11 @@ fn generate_tree_node(
     {
         let field_name = to_snake_case(&field.name);
         let type_annotation = metadata.resolve_tree_field_type(
+            field,
             child_fields.as_deref(),
             name,
             child_name,
-            |generic| field_type_with_generic(field, metadata, false, generic),
+            GenericSyntax::RUST,
         );
         writeln!(output, "    pub {}: {},", field_name, type_annotation).unwrap();
     }