From 1e2be02eb85cb96c02fd9f8ab371dcd4f6621cbe Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sat, 26 Apr 2014 17:15:28 +0200 Subject: [PATCH] Use handleOptional for the 'any' conversion. --- .../script/dom/bindings/codegen/CodegenRust.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 21c432a2e72..2fcb72383b6 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -757,13 +757,8 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None, assert not isEnforceRange and not isClamp declType = CGGeneric("JSVal") - value = CGGeneric("${val}") - if isOptional: - declType = CGWrapper(declType, pre="Option<", post=">") - value = CGWrapper(value, pre="Some(", post=")") - - templateBody = handleDefaultNull(value.define(), "NullValue()") - return (templateBody, declType, isOptional, "None" if isOptional else None) + templateBody = handleDefaultNull("${val}", "NullValue()") + return handleOptional(templateBody, declType, isOptional) if type.isObject(): raise TypeError("Can't handle object arguments yet")