Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-21 14:23:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #8966 - GuillaumeGomez:patch-1, r=nox

Browse source 
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 -->
This commit is contained in:
bors-servo 2015-12-14 17:08:23 +05:30
commit 201b5c9820
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -1011,7 +1011,8 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
# There are no nullable dictionaries # There are no nullable dictionaries
assert not type.nullable() assert not type.nullable()
typeName = CGDictionary.makeDictionaryName(type.inner) typeName = "%s::%s" % (CGDictionary.makeModuleName(type.inner),
CGDictionary.makeDictionaryName(type.inner))
declType = CGGeneric(typeName) declType = CGGeneric(typeName)
template = ("match %s::new(cx, ${val}) {\n" template = ("match %s::new(cx, ${val}) {\n"
" Ok(dictionary) => dictionary,\n" " Ok(dictionary) => dictionary,\n"