Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-11 00:15:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #8986 - GuillaumeGomez:patch-2, r=nox

Browse source 
Fix invalid returned value for dictionary types

part of #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/8986)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-12-15 22:57:58 +05:30
commit 432087c0ea
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1016,8 +1016,8 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None,
declType = CGGeneric(typeName)
template = ("match %s::new(cx, ${val}) {\n"
" Ok(dictionary) => dictionary,\n"
" Err(_) => return false,\n"
"}" % typeName)
" Err(_) => { %s },\n"
"}" % (typeName, exceptionCode))
return handleOptional(template, declType, handleDefaultNull("%s::empty(cx)" % typeName))

1
components/script/dom/webidls/TestBinding.webidl
View file

@ -28,6 +28,7 @@ dictionary TestDictionary {
Blob interfaceValue;
any anyValue;
object objectValue;
TestDictionaryDefaults dict;
};
dictionary TestDictionaryDefaults {