From 76c25a351ab89cf8e3972d0b8128126b89741b94 Mon Sep 17 00:00:00 2001 From: eri Date: Thu, 21 Mar 2024 12:38:37 +0100 Subject: [PATCH] fix: remove repeated imports --- .../dom/bindings/codegen/CodegenRust.py | 36 +++++++------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 77c75dc41c50b..d3229fb3dd23a 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -39,8 +39,13 @@ iteratorNativeType ) -AUTOGENERATED_WARNING_COMMENT = \ - "/* THIS FILE IS AUTOGENERATED - DO NOT EDIT */\n\n" +AUTOGENERATED_WARNING_COMMENT = "/* THIS FILE IS AUTOGENERATED - DO NOT EDIT */\n\n" +IGNORED_WARNING_LIST = ['non_camel_case_types', 'non_upper_case_globals', 'unused_imports', + 'unused_variables', 'unused_assignments', 'unused_mut', + 'clippy::approx_constant', 'clippy::let_unit_value', 'clippy::needless_return', + 'clippy::too_many_arguments', 'clippy::unnecessary_cast'] +IGNORED_WARNINGS = f"#![allow({','.join(IGNORED_WARNING_LIST)})]\n\n" + FINALIZE_HOOK_NAME = '_finalize' TRACE_HOOK_NAME = '_trace' CONSTRUCT_HOOK_NAME = '_constructor' @@ -2160,25 +2165,10 @@ class CGImports(CGWrapper): """ Generates the appropriate import/use statements. """ - def __init__(self, child, descriptors, callbacks, dictionaries, enums, typedefs, imports, config, - ignored_warnings=None): + def __init__(self, child, descriptors, callbacks, dictionaries, enums, typedefs, imports, config): """ Adds a set of imports. """ - if ignored_warnings is None: - ignored_warnings = [ - 'non_camel_case_types', - 'non_upper_case_globals', - 'unused_imports', - 'unused_variables', - 'unused_assignments', - 'unused_mut', - 'clippy::approx_constant', - 'clippy::let_unit_value', - 'clippy::needless_return', - 'clippy::too_many_arguments', - 'clippy::unnecessary_cast', - ] def componentTypes(type): if type.isType() and type.nullable(): @@ -2289,8 +2279,6 @@ def removeWrapperAndNullableTypes(types): extras += [getModuleFromObject(t) + '::' + getIdentifier(t).name] statements = [] - if len(ignored_warnings) > 0: - statements.append('#![allow(%s)]' % ','.join(ignored_warnings)) statements.extend('use %s;' % i for i in sorted(set(imports + extras))) CGWrapper.__init__(self, child, @@ -2658,8 +2646,8 @@ def UnionTypes(descriptors, dictionaries, callbacks, typedefs, config): # Sort unionStructs by key, retrieve value unionStructs = (i[1] for i in sorted(list(unionStructs.items()), key=operator.itemgetter(0))) - return CGImports(CGList(unionStructs, "\n\n"), descriptors=[], callbacks=[], dictionaries=[], enums=[], typedefs=[], - imports=imports, config=config, ignored_warnings=[]) + return CGImports(CGList(unionStructs, "\n\n"), descriptors=[], callbacks=[], dictionaries=[], enums=[], + typedefs=[], imports=imports, config=config) class Argument(): @@ -6959,7 +6947,7 @@ def __init__(self, config, prefix, webIDLFile): imports=['crate::dom::bindings::import::base::*'], config=config) # Add the auto-generated comment. - curr = CGWrapper(curr, pre=AUTOGENERATED_WARNING_COMMENT) + curr = CGWrapper(curr, pre=AUTOGENERATED_WARNING_COMMENT + IGNORED_WARNINGS) # Store the final result. self.root = curr @@ -7826,7 +7814,7 @@ def RegisterBindings(config): return CGImports(code, descriptors=[], callbacks=[], dictionaries=[], enums=[], typedefs=[], imports=[ 'crate::dom::bindings::codegen::Bindings', - ], config=config, ignored_warnings=[]) + ], config=config) @staticmethod def InterfaceTypes(config):