summaryrefslogtreecommitdiff
path: root/src/codegen/mod.rs
diff options
context:
space:
mode:
authorEmilio Cobos Álvarez <emilio@crisal.io>2019-03-04 03:55:18 +0100
committerGitHub <noreply@github.com>2019-03-04 03:55:18 +0100
commit3a6864cf9a76916c002c41a8ae813d9f8bd9853e (patch)
treee0335d4c4de7b34e141f055b32fa3a22ecd55771 /src/codegen/mod.rs
parent1cd830127489b19a58143c300667d045b447a62d (diff)
parenta43cc2afcd69cbaa2f699ee3d4b9c804576ffad7 (diff)
Merge pull request #1530 from emilio/rustup
Update default rust target to 1.33.
Diffstat (limited to 'src/codegen/mod.rs')
-rw-r--r--src/codegen/mod.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
index 2d71942c..d7f98c13 100644
--- a/src/codegen/mod.rs
+++ b/src/codegen/mod.rs
@@ -1589,6 +1589,7 @@ impl CodeGenerator for CompInfo {
// TODO(emilio): It'd be nice to unify this with the struct path
// above somehow.
let layout = layout.expect("Unable to get layout information?");
+ struct_layout.saw_union(layout);
if struct_layout.requires_explicit_align(layout) {
explicit_align = Some(layout.align);
@@ -1600,8 +1601,6 @@ impl CodeGenerator for CompInfo {
_bindgen_union_align: #ty ,
}
} else {
- struct_layout.saw_union(layout);
-
quote! {
pub bindgen_union_field: #ty ,
}