c2rust-refactor: Handle different number of fields between structures/unions in compatible_types

ahomescu · kkysen · commit e1fbe803c4e5 · 2025-12-08T04:01:08.000-08:00
diff --git a/c2rust-refactor/src/context.rs b/c2rust-refactor/src/context.rs
@@ -1158,7 +1158,11 @@ impl<'a, 'tcx, 'b> TypeCompare<'a, 'tcx, 'b> {
                             self.structural_eq_tys(ty1, ty2)
                         }
                     }
-                    _ => {
+                    _ => 'match_fields: {
+                        if variant1.fields().len() != variant2.fields().len() {
+                            break 'match_fields false;
+                        }
+
                         let mut fields = variant1.fields().iter().zip(variant2.fields().iter());
                         fields.all(|(field1, field2)| {
                             // TODO: either Visibility or VisibilityKind should implement

Original file line number	Diff line number	Diff line change
`@@ -1158,7 +1158,11 @@ impl<'a, 'tcx, 'b> TypeCompare<'a, 'tcx, 'b> {`
`1158`	`1158`	`self.structural_eq_tys(ty1, ty2)`
`1159`	`1159`	`}`
`1160`	`1160`	`}`
`1161`		`- _ => {`
	`1161`	`+ _ => 'match_fields: {`
	`1162`	`+ if variant1.fields().len() != variant2.fields().len() {`
	`1163`	`+ break 'match_fields false;`
	`1164`	`+ }`
	`1165`	`+`
`1162`	`1166`	`let mut fields = variant1.fields().iter().zip(variant2.fields().iter());`
`1163`	`1167`	`fields.all(\|(field1, field2)\| {`
`1164`	`1168`	`// TODO: either Visibility or VisibilityKind should implement`