From 06947965b1635c4f5ff2aebcf5dfef35c6e95f23 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 16 Oct 2015 23:21:29 +0200 Subject: Remove all our local patches to the WebIDL parser All the tweaks we need can just be made through Configuration.py, and [Abstract] is being submitted upstream by Ms2ger. --- components/script/dom/bindings/codegen/CodegenRust.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'components/script/dom/bindings/codegen/CodegenRust.py') diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 75de595694c..705192e17a7 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -23,6 +23,7 @@ from WebIDL import ( from Configuration import ( MemberIsUnforgeable, + getModuleFromObject, getTypesFromCallback, getTypesFromDescriptor, getTypesFromDictionary, @@ -920,7 +921,7 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None, assert not type.treatNonObjectAsNull() or not type.treatNonCallableAsNull() callback = type.unroll().callback - declType = CGGeneric('%s::%s' % (callback.module(), callback.identifier.name)) + declType = CGGeneric('%s::%s' % (getModuleFromObject(callback), callback.identifier.name)) finalDeclType = CGTemplatedType("Rc", declType) conversion = CGCallbackTempRoot(declType.define()) @@ -1281,7 +1282,7 @@ def getRetvalDeclarationForType(returnType, descriptorProvider): return result if returnType.isCallback(): callback = returnType.unroll().callback - result = CGGeneric('Rc<%s::%s>' % (callback.module(), callback.identifier.name)) + result = CGGeneric('Rc<%s::%s>' % (getModuleFromObject(callback), callback.identifier.name)) if returnType.nullable(): result = CGWrapper(result, pre="Option<", post=">") return result @@ -5157,7 +5158,7 @@ class CGDictionary(CGThing): @staticmethod def makeModuleName(dictionary): - return dictionary.module() + return getModuleFromObject(dictionary) def getMemberType(self, memberInfo): member, info = memberInfo @@ -6056,8 +6057,8 @@ class GlobalGenRoots(): def Bindings(config): descriptors = (set(d.name + "Binding" for d in config.getDescriptors(register=True)) | - set(d.module() for d in config.callbacks) | - set(d.module() for d in config.getDictionaries())) + set(getModuleFromObject(d) for d in config.callbacks) | + set(getModuleFromObject(d) for d in config.getDictionaries())) curr = CGList([CGGeneric("pub mod %s;\n" % name) for name in sorted(descriptors)]) curr = CGWrapper(curr, pre=AUTOGENERATED_WARNING_COMMENT) return curr -- cgit v1.2.3