Skip to content

Commit 0298b90

Browse files
committed
Reduce some nesting in cstruct_to_rs.
1 parent 7bddcb2 commit 0298b90

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

src/gen.rs

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -883,24 +883,16 @@ fn cstruct_to_rs(ctx: &mut GenCtx, name: &str, ci: CompInfo) -> Vec<P<ast::Item>
883883

884884
if ci.has_vtable {
885885
let mut vffields = vec![];
886-
let base_vftable = if !members.is_empty() {
887-
if let CompMember::Field(ref fi) = members[0] {
888-
match fi.ty {
889-
TComp(ref ci2) => {
890-
let ci2 = ci2.borrow();
891-
if ci2.has_vtable {
892-
Some(format!("_vftable_{}", ci2.name))
893-
} else {
894-
None
895-
}
896-
},
897-
_ => None
886+
let base_vftable = match members.get(0) {
887+
Some(&CompMember::Field(FieldInfo { ty: TComp(ref ci2), .. })) => {
888+
let ci2 = ci2.borrow();
889+
if ci2.has_vtable {
890+
Some(format!("_vftable_{}", ci2.name))
891+
} else {
892+
None
898893
}
899-
} else {
900-
None
901-
}
902-
} else {
903-
None
894+
},
895+
_ => None,
904896
};
905897

906898
if let Some(ref base) = base_vftable {

0 commit comments

Comments
 (0)