diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-15 22:57:58 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-15 22:57:58 +0530 |
commit | 432087c0ea6a5a419273b448eec62eb7549ba242 (patch) | |
tree | 93ea9671e5841ceebdb592e0cf4f8682414d5723 /components/script/dom/bindings/codegen/CodegenRust.py | |
parent | 81282ba82afd4c0871c3c63a13bf304a9bbe0a4d (diff) | |
parent | 14a22953ddedf5881919a762bd68e072eacfec44 (diff) | |
download | servo-432087c0ea6a5a419273b448eec62eb7549ba242.tar.gz servo-432087c0ea6a5a419273b448eec62eb7549ba242.zip |
Auto merge of #8986 - GuillaumeGomez:patch-2, r=nox
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 -->
Diffstat (limited to 'components/script/dom/bindings/codegen/CodegenRust.py')
-rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 1e8033c7347..75de595694c 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -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)) |