diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-03-03 09:02:05 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-03 09:02:05 -0800 |
| commit | b71c7ba46b5992e00cc05d9d5788b9cecbcb6305 (patch) | |
| tree | cbae28db3006497e51ffeba77c25b192ebeeb0d9 | |
| parent | d57616cab66e6bfa6ddf745e57644c671bf57cd4 (diff) | |
| parent | 0e76c8c51befe73fbbe9423d95bb96258853d1a9 (diff) | |
Auto merge of #554 - emilio:union-pad, r=fitzgen
codegen: Don't pad union fields.
Fixes #553
| -rw-r--r-- | src/codegen/mod.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs index 120acefa..fb07eaf8 100644 --- a/src/codegen/mod.rs +++ b/src/codegen/mod.rs @@ -1136,9 +1136,11 @@ impl CodeGenerator for CompInfo { } }; - if let Some(padding_field) = - struct_layout.pad_field(&field_name, field_ty, field.offset()) { - fields.push(padding_field); + if !is_union { + if let Some(padding_field) = + struct_layout.pad_field(&field_name, field_ty, field.offset()) { + fields.push(padding_field); + } } let is_private = field.annotations() |