summaryrefslogtreecommitdiff
path: root/src/codegen/mod.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-10-28 19:34:05 -0400
committerGitHub <noreply@github.com>2018-10-28 19:34:05 -0400
commit5de943ca7bf6c155f7bae1d91f1e3b1d91e8d901 (patch)
tree6ef0452a22e9e0884fc50d8a03d7a49ad8839413 /src/codegen/mod.rs
parenta242c51e6ff0d4cc27940a3927e713e8dff82c5f (diff)
parentb2083d5b4b070c4d5696c589245c291e40c7554f (diff)
Auto merge of #1430 - emilio:implicit-template-params, r=emiliov0.43.1
ir: Consistently append implicit template parameters when not using Rust unions. Fixes #1429.
Diffstat (limited to 'src/codegen/mod.rs')
-rw-r--r--src/codegen/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
index 8cc55a0e..d8524a3d 100644
--- a/src/codegen/mod.rs
+++ b/src/codegen/mod.rs
@@ -1044,6 +1044,7 @@ impl<'a> FieldCodegen<'a> for FieldData {
let field_item = self.ty().into_resolver().through_type_refs().resolve(ctx);
let field_ty = field_item.expect_type();
let mut ty = self.ty().to_rust_ty_or_opaque(ctx, &());
+ ty.append_implicit_template_params(ctx, field_item);
// NB: If supported, we use proper `union` types.
let ty = if parent.is_union() && !parent.can_be_rust_union(ctx) {
@@ -1071,7 +1072,6 @@ impl<'a> FieldCodegen<'a> for FieldData {
}
}
} else {
- ty.append_implicit_template_params(ctx, field_item);
ty
};