aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/dom/bindings/codegen
diff options
context:
space:
mode:
authorbors-servo <release+servo@mozilla.com>2014-06-02 13:07:47 -0400
committerbors-servo <release+servo@mozilla.com>2014-06-02 13:07:47 -0400
commit488ac518e4d425e3d671eb1480df4502578b789e (patch)
treed0382a952196a2a3a7031c8616750e34c41850eb /src/components/script/dom/bindings/codegen
parent6c557265533355bd588c61d54ed0b18ef9c03bcd (diff)
parent6d619f484cefb9c73df8ab515a1535d4bc2428cd (diff)
downloadservo-488ac518e4d425e3d671eb1480df4502578b789e.tar.gz
servo-488ac518e4d425e3d671eb1480df4502578b789e.zip
auto merge of #2547 : Ms2ger/servo/dictionary-tests, r=jdm
Diffstat (limited to 'src/components/script/dom/bindings/codegen')
-rw-r--r--src/components/script/dom/bindings/codegen/CodegenRust.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index 9d5578b6b58..beb0b46e8e0 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -686,7 +686,7 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
"yet")
enum = type.inner.identifier.name
if invalidEnumValueFatal:
- handleInvalidEnumValueCode = "return 0;"
+ handleInvalidEnumValueCode = exceptionCode
else:
handleInvalidEnumValueCode = "return 1;"
@@ -696,7 +696,7 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
" Ok(None) => { %(handleInvalidEnumValueCode)s },\n"
" Ok(Some(index)) => {\n"
" //XXXjdm need some range checks up in here.\n"
- " cast::transmute(index)\n"
+ " unsafe { cast::transmute(index) }\n"
" },\n"
"}" % { "values" : enum + "Values::strings",
"exceptionCode" : exceptionCode,