diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-11-21 15:16:12 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-21 15:16:12 -0600 |
commit | 399f590f67d3582482486939d404e9615f58ccf1 (patch) | |
tree | 823c44dce9715e6d5ba16a43a110d1649fed583a /libbindgen/src | |
parent | 94fff8339da07c7b45dea724a29c02c8fdc646f7 (diff) | |
parent | 77868f4379dc40b91dfd3674c8091c14dcf69ecd (diff) |
Auto merge of #290 - fitzgen:dont-assert-name-target-template-alias, r=emilio
Recurse on the inner type when finding a template alias name target
The assertion that the template alias's inner type was our name target,
and that we didn't need to recurse, is failing when generating
SpiderMonkey bindings. I'm not 100% sure when this can happen, but
clearly it can, and it is easy to support, so let's support it.
r? @emilio
Diffstat (limited to 'libbindgen/src')
-rw-r--r-- | libbindgen/src/ir/item.rs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libbindgen/src/ir/item.rs b/libbindgen/src/ir/item.rs index 32e3c4c5..d96936ad 100644 --- a/libbindgen/src/ir/item.rs +++ b/libbindgen/src/ir/item.rs @@ -556,10 +556,6 @@ impl Item { TypeKind::TemplateAlias(inner, _) if for_name_checking => { item = ctx.resolve_item(inner); - assert_eq!(item.id(), - item.name_target(ctx, - for_name_checking)); - return item.id(); } _ => return item.id(), } |