From 643ea874d101700d59153d9bd3f2033135754d08 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 17 Apr 2014 12:19:47 +0200 Subject: Rewrite the any unwrapping to return an expression. --- src/components/script/dom/bindings/codegen/CodegenRust.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/components/script/dom/bindings/codegen/CodegenRust.py') diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 7262c6d7a77..62f2138147c 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -767,11 +767,8 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None, declType = CGWrapper(declType, pre="Option<", post=">") value = CGWrapper(value, pre="Some(", post=")") - templateBody = "${declName} = %s;" % value.define() - templateBody = handleDefaultNull(templateBody, - "${declName} = NullValue();") - - return (templateBody, declType, None, isOptional, "None" if isOptional else None) + templateBody = handleDefaultNull(value.define(), "NullValue()") + return ("${declName} = " + templateBody + ";", declType, None, isOptional, "None" if isOptional else None) if type.isObject(): raise TypeError("Can't handle object arguments yet") -- cgit v1.2.3