From 8e596d142ef246eca7321cc9fff64d172e797ae9 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 18 Apr 2014 14:34:47 +0200 Subject: [PATCH] Use 'exceptionCode' when converting to DOMString. This change allows us to use the code even in cases where we return a Result type rather than a JSBool. Interface, primitive and union types already get this right. --- src/components/script/dom/bindings/codegen/CodegenRust.py | 4 ++-- 1 file 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 ba9e53e2723..8cf3766619b 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -670,8 +670,8 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None, conversionCode = ( "match FromJSValConvertible::from_jsval(cx, ${val}, %s) {\n" " Ok(strval) => ${declName} = %s,\n" - " Err(_) => return 0,\n" - "}" % (nullBehavior, strval)) + " Err(_) => { %s },\n" + "}" % (nullBehavior, strval, exceptionCode)) if defaultValue is None: return conversionCode