From 35f6a24de79882902eaceadf6e3a8c8d60b8f704 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sat, 26 Apr 2014 16:26:51 +0200 Subject: [PATCH] Use FromJSValConvertible's nullable conversion code. --- .../script/dom/bindings/codegen/CodegenRust.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 80a37097e8b..eb219f0fe30 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -576,21 +576,13 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None, "holderType") declType = CGGeneric(type.name) - value = CGGeneric("value") if type.nullable(): declType = CGWrapper(declType, pre="Option<", post=" >") - value = CGWrapper(value, pre="Some(", post=")") templateBody = CGGeneric("match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n" + " Ok(value) => value,\n" " Err(()) => { %s },\n" - " Ok(value) => %s,\n" - "}" % (exceptionCode, value.define())) - - if type.nullable(): - templateBody = CGIfElseWrapper( - "(${val}).is_null_or_undefined()", - CGGeneric("None"), - templateBody) + "}" % exceptionCode) templateBody = handleDefaultNull(templateBody.define(), "None")