Rust: codegen: fix generated code

aibaars · aibaars · commit c8f73587ccdf · 2024-09-07T10:32:59.000+02:00
diff --git a/misc/codegen/templates/rust_classes.mustache b/misc/codegen/templates/rust_classes.mustache
@@ -35,12 +35,12 @@ impl TrapEntry for {{name}} {
         {{/is_repeated}}
         {{/is_optional}}
         {{#is_repeated}}
-        for (i, &v) in self.{{field_name}}.iter().enumerate() {
+        for (i, v) in self.{{field_name}}.into_iter().enumerate() {
             {{^is_optional}}
             out.add_tuple("{{table_name}}", vec![trap::Arg::Label(id){{^is_unordered}}, i.into(){{/is_unordered}}, v.into()]);
             {{/is_optional}}
             {{#is_optional}}
-            if let Some(vv) = v {
+            if let Some(v) = v {
                 out.add_tuple("{{table_name}}", vec![trap::Arg::Label(id){{^is_unordered}}, i.into(){{/is_unordered}}, v.into()]);
             }
             {{/is_optional}}
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
@@ -280,7 +280,7 @@ impl TrapEntry for Call {
         if let Some(v) = self.location {
             out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
         }
-        for (i, &v) in self.args.iter().enumerate() {
+        for (i, v) in self.args.into_iter().enumerate() {
             out.add_tuple("call_args", vec![trap::Arg::Label(id), i.into(), v.into()]);
         }
         if self.is_assignee_expr {
@@ -331,11 +331,11 @@ impl TrapEntry for Closure {
         if let Some(v) = self.location {
             out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
         }
-        for (i, &v) in self.args.iter().enumerate() {
+        for (i, v) in self.args.into_iter().enumerate() {
             out.add_tuple("closure_args", vec![trap::Arg::Label(id), i.into(), v.into()]);
         }
-        for (i, &v) in self.arg_types.iter().enumerate() {
-            if let Some(vv) = v {
+        for (i, v) in self.arg_types.into_iter().enumerate() {
+            if let Some(v) = v {
                 out.add_tuple("closure_arg_types", vec![trap::Arg::Label(id), i.into(), v.into()]);
             }
         }
@@ -699,7 +699,7 @@ impl TrapEntry for Match {
         if let Some(v) = self.location {
             out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
         }
-        for (i, &v) in self.branches.iter().enumerate() {
+        for (i, v) in self.branches.into_iter().enumerate() {
             out.add_tuple("match_branches", vec![trap::Arg::Label(id), i.into(), v.into()]);
         }
     }
@@ -724,7 +724,7 @@ impl TrapEntry for MethodCall {
         if let Some(v) = self.location {
             out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
         }
-        for (i, &v) in self.args.iter().enumerate() {
+        for (i, v) in self.args.into_iter().enumerate() {
             out.add_tuple("method_call_args", vec![trap::Arg::Label(id), i.into(), v.into()]);
         }
     }
@@ -785,7 +785,7 @@ impl TrapEntry for Module {
         if let Some(v) = self.location {
             out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
         }
-        for (i, &v) in self.declarations.iter().enumerate() {
+        for (i, v) in self.declarations.into_iter().enumerate() {
             out.add_tuple("module_declarations", vec![trap::Arg::Label(id), i.into(), v.into()]);
         }
     }
@@ -809,7 +809,7 @@ impl TrapEntry for OffsetOf {
         if let Some(v) = self.location {
             out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
         }
-        for (i, &v) in self.fields.iter().enumerate() {
+        for (i, v) in self.fields.into_iter().enumerate() {
             out.add_tuple("offset_of_fields", vec![trap::Arg::Label(id), i.into(), v.into()]);
         }
     }
@@ -832,7 +832,7 @@ impl TrapEntry for OrPat {
         if let Some(v) = self.location {
             out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
         }
-        for (i, &v) in self.args.iter().enumerate() {
+        for (i, v) in self.args.into_iter().enumerate() {
             out.add_tuple("or_pat_args", vec![trap::Arg::Label(id), i.into(), v.into()]);
         }
     }
@@ -1066,13 +1066,13 @@ impl TrapEntry for SlicePat {
         if let Some(v) = self.location {
             out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
         }
-        for (i, &v) in self.prefix.iter().enumerate() {
+        for (i, v) in self.prefix.into_iter().enumerate() {
             out.add_tuple("slice_pat_prefixes", vec![trap::Arg::Label(id), i.into(), v.into()]);
         }
         if let Some(v) = self.slice {
             out.add_tuple("slice_pat_slice", vec![trap::Arg::Label(id), v.into()]);
         }
-        for (i, &v) in self.suffix.iter().enumerate() {
+        for (i, v) in self.suffix.into_iter().enumerate() {
             out.add_tuple("slice_pat_suffixes", vec![trap::Arg::Label(id), i.into(), v.into()]);
         }
     }
@@ -1096,7 +1096,7 @@ impl TrapEntry for Tuple {
         if let Some(v) = self.location {
             out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
         }
-        for (i, &v) in self.exprs.iter().enumerate() {
+        for (i, v) in self.exprs.into_iter().enumerate() {
             out.add_tuple("tuple_exprs", vec![trap::Arg::Label(id), i.into(), v.into()]);
         }
         if self.is_assignee_expr {
@@ -1123,7 +1123,7 @@ impl TrapEntry for TuplePat {
         if let Some(v) = self.location {
             out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
         }
-        for (i, &v) in self.args.iter().enumerate() {
+        for (i, v) in self.args.into_iter().enumerate() {
             out.add_tuple("tuple_pat_args", vec![trap::Arg::Label(id), i.into(), v.into()]);
         }
         if let Some(v) = self.ellipsis {
@@ -1274,7 +1274,7 @@ impl TrapEntry for AsyncBlock {
         if let Some(v) = self.location {
             out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
         }
-        for (i, &v) in self.statements.iter().enumerate() {
+        for (i, v) in self.statements.into_iter().enumerate() {
             out.add_tuple("block_base_statements", vec![trap::Arg::Label(id), i.into(), v.into()]);
         }
         if let Some(v) = self.tail {
@@ -1302,7 +1302,7 @@ impl TrapEntry for Block {
         if let Some(v) = self.location {
             out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
         }
-        for (i, &v) in self.statements.iter().enumerate() {
+        for (i, v) in self.statements.into_iter().enumerate() {
             out.add_tuple("block_base_statements", vec![trap::Arg::Label(id), i.into(), v.into()]);
         }
         if let Some(v) = self.tail {
@@ -1332,7 +1332,7 @@ impl TrapEntry for ElementList {
         if let Some(v) = self.location {
             out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
         }
-        for (i, &v) in self.elements.iter().enumerate() {
+        for (i, v) in self.elements.into_iter().enumerate() {
             out.add_tuple("element_list_elements", vec![trap::Arg::Label(id), i.into(), v.into()]);
         }
         if self.is_assignee_expr {
@@ -1380,7 +1380,7 @@ impl TrapEntry for UnsafeBlock {
         if let Some(v) = self.location {
             out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);
         }
-        for (i, &v) in self.statements.iter().enumerate() {
+        for (i, v) in self.statements.into_iter().enumerate() {
             out.add_tuple("block_base_statements", vec![trap::Arg::Label(id), i.into(), v.into()]);
         }
         if let Some(v) = self.tail {

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ impl TrapEntry for Call {`
`280`	`280`	`if let Some(v) = self.location {`
`281`	`281`	`out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);`
`282`	`282`	`}`
`283`		`- for (i, &v) in self.args.iter().enumerate() {`
	`283`	`+ for (i, v) in self.args.into_iter().enumerate() {`
`284`	`284`	`out.add_tuple("call_args", vec![trap::Arg::Label(id), i.into(), v.into()]);`
`285`	`285`	`}`
`286`	`286`	`if self.is_assignee_expr {`
`@@ -331,11 +331,11 @@ impl TrapEntry for Closure {`
`331`	`331`	`if let Some(v) = self.location {`
`332`	`332`	`out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);`
`333`	`333`	`}`
`334`		`- for (i, &v) in self.args.iter().enumerate() {`
	`334`	`+ for (i, v) in self.args.into_iter().enumerate() {`
`335`	`335`	`out.add_tuple("closure_args", vec![trap::Arg::Label(id), i.into(), v.into()]);`
`336`	`336`	`}`
`337`		`- for (i, &v) in self.arg_types.iter().enumerate() {`
`338`		`- if let Some(vv) = v {`
	`337`	`+ for (i, v) in self.arg_types.into_iter().enumerate() {`
	`338`	`+ if let Some(v) = v {`
`339`	`339`	`out.add_tuple("closure_arg_types", vec![trap::Arg::Label(id), i.into(), v.into()]);`
`340`	`340`	`}`
`341`	`341`	`}`
`@@ -699,7 +699,7 @@ impl TrapEntry for Match {`
`699`	`699`	`if let Some(v) = self.location {`
`700`	`700`	`out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);`
`701`	`701`	`}`
`702`		`- for (i, &v) in self.branches.iter().enumerate() {`
	`702`	`+ for (i, v) in self.branches.into_iter().enumerate() {`
`703`	`703`	`out.add_tuple("match_branches", vec![trap::Arg::Label(id), i.into(), v.into()]);`
`704`	`704`	`}`
`705`	`705`	`}`
`@@ -724,7 +724,7 @@ impl TrapEntry for MethodCall {`
`724`	`724`	`if let Some(v) = self.location {`
`725`	`725`	`out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);`
`726`	`726`	`}`
`727`		`- for (i, &v) in self.args.iter().enumerate() {`
	`727`	`+ for (i, v) in self.args.into_iter().enumerate() {`
`728`	`728`	`out.add_tuple("method_call_args", vec![trap::Arg::Label(id), i.into(), v.into()]);`
`729`	`729`	`}`
`730`	`730`	`}`
`@@ -785,7 +785,7 @@ impl TrapEntry for Module {`
`785`	`785`	`if let Some(v) = self.location {`
`786`	`786`	`out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);`
`787`	`787`	`}`
`788`		`- for (i, &v) in self.declarations.iter().enumerate() {`
	`788`	`+ for (i, v) in self.declarations.into_iter().enumerate() {`
`789`	`789`	`out.add_tuple("module_declarations", vec![trap::Arg::Label(id), i.into(), v.into()]);`
`790`	`790`	`}`
`791`	`791`	`}`
`@@ -809,7 +809,7 @@ impl TrapEntry for OffsetOf {`
`809`	`809`	`if let Some(v) = self.location {`
`810`	`810`	`out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);`
`811`	`811`	`}`
`812`		`- for (i, &v) in self.fields.iter().enumerate() {`
	`812`	`+ for (i, v) in self.fields.into_iter().enumerate() {`
`813`	`813`	`out.add_tuple("offset_of_fields", vec![trap::Arg::Label(id), i.into(), v.into()]);`
`814`	`814`	`}`
`815`	`815`	`}`
`@@ -832,7 +832,7 @@ impl TrapEntry for OrPat {`
`832`	`832`	`if let Some(v) = self.location {`
`833`	`833`	`out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);`
`834`	`834`	`}`
`835`		`- for (i, &v) in self.args.iter().enumerate() {`
	`835`	`+ for (i, v) in self.args.into_iter().enumerate() {`
`836`	`836`	`out.add_tuple("or_pat_args", vec![trap::Arg::Label(id), i.into(), v.into()]);`
`837`	`837`	`}`
`838`	`838`	`}`
`@@ -1066,13 +1066,13 @@ impl TrapEntry for SlicePat {`
`1066`	`1066`	`if let Some(v) = self.location {`
`1067`	`1067`	`out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);`
`1068`	`1068`	`}`
`1069`		`- for (i, &v) in self.prefix.iter().enumerate() {`
	`1069`	`+ for (i, v) in self.prefix.into_iter().enumerate() {`
`1070`	`1070`	`out.add_tuple("slice_pat_prefixes", vec![trap::Arg::Label(id), i.into(), v.into()]);`
`1071`	`1071`	`}`
`1072`	`1072`	`if let Some(v) = self.slice {`
`1073`	`1073`	`out.add_tuple("slice_pat_slice", vec![trap::Arg::Label(id), v.into()]);`
`1074`	`1074`	`}`
`1075`		`- for (i, &v) in self.suffix.iter().enumerate() {`
	`1075`	`+ for (i, v) in self.suffix.into_iter().enumerate() {`
`1076`	`1076`	`out.add_tuple("slice_pat_suffixes", vec![trap::Arg::Label(id), i.into(), v.into()]);`
`1077`	`1077`	`}`
`1078`	`1078`	`}`
`@@ -1096,7 +1096,7 @@ impl TrapEntry for Tuple {`
`1096`	`1096`	`if let Some(v) = self.location {`
`1097`	`1097`	`out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);`
`1098`	`1098`	`}`
`1099`		`- for (i, &v) in self.exprs.iter().enumerate() {`
	`1099`	`+ for (i, v) in self.exprs.into_iter().enumerate() {`
`1100`	`1100`	`out.add_tuple("tuple_exprs", vec![trap::Arg::Label(id), i.into(), v.into()]);`
`1101`	`1101`	`}`
`1102`	`1102`	`if self.is_assignee_expr {`
`@@ -1123,7 +1123,7 @@ impl TrapEntry for TuplePat {`
`1123`	`1123`	`if let Some(v) = self.location {`
`1124`	`1124`	`out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);`
`1125`	`1125`	`}`
`1126`		`- for (i, &v) in self.args.iter().enumerate() {`
	`1126`	`+ for (i, v) in self.args.into_iter().enumerate() {`
`1127`	`1127`	`out.add_tuple("tuple_pat_args", vec![trap::Arg::Label(id), i.into(), v.into()]);`
`1128`	`1128`	`}`
`1129`	`1129`	`if let Some(v) = self.ellipsis {`
`@@ -1274,7 +1274,7 @@ impl TrapEntry for AsyncBlock {`
`1274`	`1274`	`if let Some(v) = self.location {`
`1275`	`1275`	`out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);`
`1276`	`1276`	`}`
`1277`		`- for (i, &v) in self.statements.iter().enumerate() {`
	`1277`	`+ for (i, v) in self.statements.into_iter().enumerate() {`
`1278`	`1278`	`out.add_tuple("block_base_statements", vec![trap::Arg::Label(id), i.into(), v.into()]);`
`1279`	`1279`	`}`
`1280`	`1280`	`if let Some(v) = self.tail {`
`@@ -1302,7 +1302,7 @@ impl TrapEntry for Block {`
`1302`	`1302`	`if let Some(v) = self.location {`
`1303`	`1303`	`out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);`
`1304`	`1304`	`}`
`1305`		`- for (i, &v) in self.statements.iter().enumerate() {`
	`1305`	`+ for (i, v) in self.statements.into_iter().enumerate() {`
`1306`	`1306`	`out.add_tuple("block_base_statements", vec![trap::Arg::Label(id), i.into(), v.into()]);`
`1307`	`1307`	`}`
`1308`	`1308`	`if let Some(v) = self.tail {`
`@@ -1332,7 +1332,7 @@ impl TrapEntry for ElementList {`
`1332`	`1332`	`if let Some(v) = self.location {`
`1333`	`1333`	`out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);`
`1334`	`1334`	`}`
`1335`		`- for (i, &v) in self.elements.iter().enumerate() {`
	`1335`	`+ for (i, v) in self.elements.into_iter().enumerate() {`
`1336`	`1336`	`out.add_tuple("element_list_elements", vec![trap::Arg::Label(id), i.into(), v.into()]);`
`1337`	`1337`	`}`
`1338`	`1338`	`if self.is_assignee_expr {`
`@@ -1380,7 +1380,7 @@ impl TrapEntry for UnsafeBlock {`
`1380`	`1380`	`if let Some(v) = self.location {`
`1381`	`1381`	`out.add_tuple("locatable_locations", vec![trap::Arg::Label(id), v.into()]);`
`1382`	`1382`	`}`
`1383`		`- for (i, &v) in self.statements.iter().enumerate() {`
	`1383`	`+ for (i, v) in self.statements.into_iter().enumerate() {`
`1384`	`1384`	`out.add_tuple("block_base_statements", vec![trap::Arg::Label(id), i.into(), v.into()]);`
`1385`	`1385`	`}`
`1386`	`1386`	`if let Some(v) = self.tail {`