@@ -119,8 +119,8 @@ fn write_node_field_accessor(
119119 if field. optional {
120120 writeln ! (
121121 file,
122- " pub fn {}(&self) -> Option<{}> {{" ,
123- field. name, rust_type
122+ " pub fn {}(&self) -> Option<{rust_type }> {{" ,
123+ field. name,
124124 ) ?;
125125 writeln ! (
126126 file,
@@ -136,11 +136,10 @@ fn write_node_field_accessor(
136136 ) ?;
137137 writeln ! ( file, " }}" ) ?;
138138 } else {
139- writeln ! ( file, " pub fn {}(&self) -> {} {{" , field. name, rust_type ) ?;
139+ writeln ! ( file, " pub fn {}(&self) -> {rust_type } {{" , field. name) ?;
140140 writeln ! (
141141 file,
142- " {} {{ parser: self.parser, pointer: unsafe {{ (*self.pointer).{} }} }}" ,
143- rust_type,
142+ " {rust_type} {{ parser: self.parser, pointer: unsafe {{ (*self.pointer).{} }} }}" ,
144143 field. c_name( )
145144 ) ?;
146145 }
@@ -161,8 +160,8 @@ fn write_visit_trait(file: &mut File, config: &Config) -> Result<(), Box<dyn std
161160 let node_variant_name = node. variant_name ( ) ;
162161 let method_name = convert_name ( node_variant_name, CIdentifier :: Method ) ;
163162
164- writeln ! ( file, " Node::{}(it) => {{" , node_variant_name ) ?;
165- writeln ! ( file, " self.visit_{}_node(it);" , method_name , ) ?;
163+ writeln ! ( file, " Node::{node_variant_name }(it) => {{" ) ?;
164+ writeln ! ( file, " self.visit_{method_name }_node(it);" ) ?;
166165 writeln ! ( file, " }}" ) ?;
167166 }
168167
@@ -176,10 +175,9 @@ fn write_visit_trait(file: &mut File, config: &Config) -> Result<(), Box<dyn std
176175 writeln ! ( file) ?;
177176 writeln ! (
178177 file,
179- " fn visit_{}_node(&mut self, node: &{}Node) {{" ,
180- method_name, node_variant_name
178+ " fn visit_{method_name}_node(&mut self, node: &{node_variant_name}Node) {{"
181179 ) ?;
182- writeln ! ( file, " visit_{}_node(self, node);" , method_name ) ?;
180+ writeln ! ( file, " visit_{method_name }_node(self, node);" ) ?;
183181 writeln ! ( file, " }}" ) ?;
184182 }
185183 writeln ! ( file, "}}" ) ?;
@@ -226,8 +224,7 @@ fn write_visit_trait(file: &mut File, config: &Config) -> Result<(), Box<dyn std
226224
227225 writeln ! (
228226 file,
229- "pub fn visit_{}_node<V: Visit + ?Sized>(visitor: &mut V, node: &{}Node) {{" ,
230- method_name, node_variant_name
227+ "pub fn visit_{method_name}_node<V: Visit + ?Sized>(visitor: &mut V, node: &{node_variant_name}Node) {{"
231228 ) ?;
232229
233230 if let Some ( fields) = & node. fields {
@@ -504,7 +501,7 @@ fn generate(config: &Config) -> Result<(), Box<dyn Error>> {
504501 . strip_suffix ( "Node" )
505502 . unwrap_or ( & node. rust_name ) ;
506503
507- writeln ! ( file, " {}({})," , variant_name , node. rust_name) ?;
504+ writeln ! ( file, " {variant_name }({})," , node. rust_name) ?;
508505 }
509506 writeln ! ( file, "}}" ) ?;
510507
@@ -517,14 +514,13 @@ fn generate(config: &Config) -> Result<(), Box<dyn Error>> {
517514 writeln ! ( file, " match unsafe {{ (*node).type_ }} {{" ) ?;
518515 for node in & config. nodes {
519516 let enum_name = convert_name ( & node. name , CIdentifier :: Constant ) ;
517+ let c_type = convert_name ( & node. name , CIdentifier :: Type ) ;
520518
521519 writeln ! (
522520 file,
523- " rbs_node_type::{} => Self::{}({} {{ parser, pointer: node.cast::<{}>() }})," ,
524- enum_name,
521+ " rbs_node_type::{enum_name} => Self::{}({} {{ parser, pointer: node.cast::<{c_type}>() }})," ,
525522 node. variant_name( ) ,
526523 node. rust_name,
527- convert_name( & node. name, CIdentifier :: Type )
528524 ) ?;
529525 }
530526 writeln ! (
0 commit comments