From 13e26e0fe072044ba9a1f327357c1bdd62df6327 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sat, 26 Apr 2014 17:29:30 +0200
Subject: Use handleOptional for the DOMString conversion.

---
 .../script/dom/bindings/codegen/CodegenRust.py          | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 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 ccd010a1b02..5151179f89a 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -658,16 +658,12 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
         else:
             nullBehavior = treatAs[treatNullAs]
 
-        def getConversionCode(isOptional=False):
-            strval = "strval"
-            if isOptional:
-                strval = "Some(%s)" % strval
-
+        def getConversionCode():
             conversionCode = (
                 "match FromJSValConvertible::from_jsval(cx, ${val}, %s) {\n"
-                "  Ok(strval) => %s,\n"
+                "  Ok(strval) => strval,\n"
                 "  Err(_) => { %s },\n"
-                "}" % (nullBehavior, strval, exceptionCode))
+                "}" % (nullBehavior, exceptionCode))
 
             if defaultValue is None:
                 return conversionCode
@@ -690,15 +686,10 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
             return handleDefault(conversionCode, default)
 
         declType = "DOMString"
-        initialValue = None
         if type.nullable():
             declType = "Option<%s>" % declType
 
-        if isOptional:
-            declType = "Option<%s>" % declType
-            initialValue = "None"
-
-        return (getConversionCode(isOptional), CGGeneric(declType), False, initialValue)
+        return handleOptional(getConversionCode(), CGGeneric(declType), isOptional)
 
     if type.isEnum():
         assert not isEnforceRange and not isClamp
-- 
cgit v1.2.3