servo: Merge #1945 - Pass the isDefinitelyObject argument to wrapObje…

…ctTemplate (from Ms2ger:1196-isDefinitelyObject); r=jdm ... and fix nearby whitespace (fixes #1196). Source-Repo: https://github.com/servo/servo Source-Revision: 9e53b4d828f9cf9af560a4f9106e474eadfa3fa1
dothq · Mar 20, 2014 · 562cc53 · 562cc53
1 parent 34aa180
commit 562cc53
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/servo/src/components/script/dom/bindings/codegen/CodegenRust.py b/servo/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -629,9 +629,9 @@ def wrapObjectTemplate(templateBody, isDefinitelyObject, type,
         if descriptor.interface.isCallback():
             name = descriptor.nativeType
             declType = CGGeneric("Option<%s>" % name);
-            conversion = ("  ${declName} = Some(%s::new((${val}).to_object()));\n" % name)
+            conversion = ("${declName} = Some(%s::new((${val}).to_object()));" % name)
 
-            template = wrapObjectTemplate(conversion, type,
+            template = wrapObjectTemplate(conversion, isDefinitelyObject, type,
                                           "${declName} = None",
                                           failureCode)
             return (template, declType, None, isOptional, None)