Simplify CGConstant.

servo · Feb 16, 2017 · 890273e · 890273e
1 parent 84a44a4
commit 890273e
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -4011,17 +4011,14 @@ def convertConstIDLValueToRust(value):
 
 
 class CGConstant(CGThing):
-    def __init__(self, constants):
+    def __init__(self, constant):
         CGThing.__init__(self)
-        self.constants = constants
+        self.constant = constant
 
     def define(self):
-        def stringDecl(const):
-            name = const.identifier.name
-            value = convertConstIDLValueToRust(const.value)
-            return CGGeneric("pub const %s: %s = %s;\n" % (name, builtinNames[const.value.type.tag()], value))
-
-        return CGIndenter(CGList(stringDecl(m) for m in self.constants)).define()
+        name = self.constant.identifier.name
+        value = convertConstIDLValueToRust(self.constant.value)
+        return "pub const %s: %s = %s;\n" % (name, builtinNames[self.constant.value.type.tag()], value)
 
 
 def getUnionTypeTemplateVars(type, descriptorProvider):
@@ -5696,10 +5693,10 @@ def reexportedName(name):
             cgThings.append(CGClassTraceHook(descriptor))
 
         # If there are no constant members, don't make a module for constants
-        constMembers = [m for m in descriptor.interface.members if m.isConst()]
+        constMembers = [CGConstant(m) for m in descriptor.interface.members if m.isConst()]
         if constMembers:
             cgThings.append(CGNamespace.build([descriptor.name + "Constants"],
-                                              CGConstant(constMembers),
+                                              CGIndenter(CGList(constMembers)),
                                               public=True))
             reexports.append(descriptor.name + 'Constants')