Skip to content

Commit

Permalink
Auto merge of #8966 - GuillaumeGomez:patch-1, r=nox
Browse files Browse the repository at this point in the history
Fix invalid dictionary inheritance

Needed by #8882.

cc @nox

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8966)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Dec 14, 2015
2 parents 1d7f296 + 4c99a85 commit 201b5c9
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion components/script/dom/bindings/codegen/CodegenRust.py
Expand Up @@ -1011,7 +1011,8 @@ def wrapObjectTemplate(templateBody, nullValue, isDefinitelyObject, type,
# There are no nullable dictionaries
assert not type.nullable()

typeName = CGDictionary.makeDictionaryName(type.inner)
typeName = "%s::%s" % (CGDictionary.makeModuleName(type.inner),
CGDictionary.makeDictionaryName(type.inner))
declType = CGGeneric(typeName)
template = ("match %s::new(cx, ${val}) {\n"
" Ok(dictionary) => dictionary,\n"
Expand Down

0 comments on commit 201b5c9

Please sign in to comment.