From 54d2e8e2359f534fc7253f718c736e7eed7f6fac Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sun, 27 Apr 2014 20:55:21 +0200 Subject: Use handleOptional for interface conversion. --- src/components/script/dom/bindings/codegen/CodegenRust.py | 4 ++-- 1 file changed, 2 insertions(+), 2 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 1fa4b47e8e4..ea5aac30305 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -628,14 +628,14 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None, "(${val}).to_object()")) declType = CGGeneric(descriptor.nativeType) - if type.nullable() or isOptional: + if type.nullable(): templateBody = "Some(%s)" % templateBody declType = CGWrapper(declType, pre="Option<", post=">") templateBody = wrapObjectTemplate(templateBody, isDefinitelyObject, type, failureCode) - return (templateBody, declType, isOptional, "None" if isOptional else None) + return handleOptional(templateBody, declType, isOptional) if type.isSpiderMonkeyInterface(): raise TypeError("Can't handle SpiderMonkey interface arguments yet") -- cgit v1.2.3