From f11e7ee0a9f0d0181ce5efa809ccff888d1ff06a Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 20 Jun 2014 17:31:47 +0200 Subject: [PATCH] Generate code for NoInterfaceObject interfaces in InterfaceTypes and InheritTypes. There is no reason for those interfaces to be excluded. --- .../script/dom/bindings/codegen/CodegenRust.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 3fd95722f34..3155ab2f025 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -5128,13 +5128,7 @@ class GlobalGenRoots(): @staticmethod def InterfaceTypes(config): - - def pathToType(descriptor): - if descriptor.interface.isCallback(): - return "dom::bindings::codegen::Bindings::%sBinding" % descriptor.name - return "dom::%s" % descriptor.name.lower() - - descriptors = [d.name for d in config.getDescriptors(register=True, hasInterfaceObject=True)] + descriptors = [d.name for d in config.getDescriptors(register=True, isCallback=False)] curr = CGList([CGGeneric("pub use dom::%s::%s;\n" % (name.lower(), name)) for name in descriptors]) curr = CGWrapper(curr, pre=AUTOGENERATED_WARNING_COMMENT) return curr @@ -5151,7 +5145,7 @@ class GlobalGenRoots(): @staticmethod def InheritTypes(config): - descriptors = config.getDescriptors(register=True, hasInterfaceObject=True) + descriptors = config.getDescriptors(register=True, isCallback=False) allprotos = [CGGeneric("#![allow(unused_imports)]\n"), CGGeneric("use dom::types::*;\n"), CGGeneric("use dom::bindings::js::{JS, JSRef, Temporary};\n"),