From dbb5f4c75e61f03166cae16e477c4f19f1633273 Mon Sep 17 00:00:00 2001 From: overlookmotel <557937+overlookmotel@users.noreply.github.com> Date: Fri, 9 Aug 2024 07:48:09 +0000 Subject: [PATCH] refactor(ast_codegen): remove unnecessary imports from generated files (#4774) #4773 makes types like `Span` importable from `oxc_ast::ast`, so remove the imports from other crates in generated code. I'm not sure why clippy's `wildcard_imports` rule was not being triggered for `use crate::ast::*;`, but add `#[allow(clippy::wildcard_imports)]` on these statements just to make sure. --- crates/oxc_ast/src/generated/assert_layouts.rs | 4 +--- crates/oxc_ast/src/generated/ast_builder.rs | 7 ------- crates/oxc_ast/src/generated/ast_kind.rs | 1 + crates/oxc_ast/src/generated/derive_clone_in.rs | 1 + crates/oxc_ast/src/generated/derive_get_span.rs | 3 ++- crates/oxc_ast/src/generated/derive_get_span_mut.rs | 3 ++- crates/oxc_ast/src/generated/visit.rs | 4 +++- crates/oxc_ast/src/generated/visit_mut.rs | 4 +++- tasks/ast_codegen/src/generators/assert_layouts.rs | 5 +---- tasks/ast_codegen/src/generators/ast_builder.rs | 7 ------- tasks/ast_codegen/src/generators/ast_kind.rs | 1 + tasks/ast_codegen/src/generators/derive_clone_in.rs | 1 + tasks/ast_codegen/src/generators/derive_get_span.rs | 3 ++- tasks/ast_codegen/src/generators/visit.rs | 4 +++- 14 files changed, 21 insertions(+), 27 deletions(-) diff --git a/crates/oxc_ast/src/generated/assert_layouts.rs b/crates/oxc_ast/src/generated/assert_layouts.rs index b133677a3d556..b961bcafceaee 100644 --- a/crates/oxc_ast/src/generated/assert_layouts.rs +++ b/crates/oxc_ast/src/generated/assert_layouts.rs @@ -3,9 +3,7 @@ use std::mem::{align_of, offset_of, size_of}; -use oxc_span::*; -use oxc_syntax::{number::*, operator::*}; - +#[allow(clippy::wildcard_imports)] use crate::ast::*; #[cfg(target_pointer_width = "64")] diff --git a/crates/oxc_ast/src/generated/ast_builder.rs b/crates/oxc_ast/src/generated/ast_builder.rs index c3de0e7024699..d80b44878c0d0 100644 --- a/crates/oxc_ast/src/generated/ast_builder.rs +++ b/crates/oxc_ast/src/generated/ast_builder.rs @@ -8,13 +8,6 @@ )] use oxc_allocator::{Allocator, Box, IntoIn, Vec}; -use oxc_span::{Atom, SourceType, Span}; -use oxc_syntax::{ - number::{BigintBase, NumberBase}, - operator::{ - AssignmentOperator, BinaryOperator, LogicalOperator, UnaryOperator, UpdateOperator, - }, -}; #[allow(clippy::wildcard_imports)] use crate::ast::*; diff --git a/crates/oxc_ast/src/generated/ast_kind.rs b/crates/oxc_ast/src/generated/ast_kind.rs index 5c5235f11f5f3..e448a50b2b59d 100644 --- a/crates/oxc_ast/src/generated/ast_kind.rs +++ b/crates/oxc_ast/src/generated/ast_kind.rs @@ -3,6 +3,7 @@ use oxc_span::{GetSpan, Span}; +#[allow(clippy::wildcard_imports)] use crate::ast::*; #[derive(Debug, Clone, Copy)] diff --git a/crates/oxc_ast/src/generated/derive_clone_in.rs b/crates/oxc_ast/src/generated/derive_clone_in.rs index 069a0c4bcbfb1..4f396074b2082 100644 --- a/crates/oxc_ast/src/generated/derive_clone_in.rs +++ b/crates/oxc_ast/src/generated/derive_clone_in.rs @@ -3,6 +3,7 @@ use oxc_allocator::{Allocator, CloneIn}; +#[allow(clippy::wildcard_imports)] use crate::ast::*; impl<'alloc> CloneIn<'alloc> for BooleanLiteral { diff --git a/crates/oxc_ast/src/generated/derive_get_span.rs b/crates/oxc_ast/src/generated/derive_get_span.rs index 4bc30a0680d1a..53afc6464561f 100644 --- a/crates/oxc_ast/src/generated/derive_get_span.rs +++ b/crates/oxc_ast/src/generated/derive_get_span.rs @@ -3,8 +3,9 @@ #![allow(clippy::match_same_arms)] -use oxc_span::{GetSpan, Span}; +use oxc_span::GetSpan; +#[allow(clippy::wildcard_imports)] use crate::ast::*; impl GetSpan for BooleanLiteral { diff --git a/crates/oxc_ast/src/generated/derive_get_span_mut.rs b/crates/oxc_ast/src/generated/derive_get_span_mut.rs index 3a2b37dc145f0..36e17d8843964 100644 --- a/crates/oxc_ast/src/generated/derive_get_span_mut.rs +++ b/crates/oxc_ast/src/generated/derive_get_span_mut.rs @@ -3,8 +3,9 @@ #![allow(clippy::match_same_arms)] -use oxc_span::{GetSpanMut, Span}; +use oxc_span::GetSpanMut; +#[allow(clippy::wildcard_imports)] use crate::ast::*; impl GetSpanMut for BooleanLiteral { diff --git a/crates/oxc_ast/src/generated/visit.rs b/crates/oxc_ast/src/generated/visit.rs index 784c8e343c23e..636343ce3ec81 100644 --- a/crates/oxc_ast/src/generated/visit.rs +++ b/crates/oxc_ast/src/generated/visit.rs @@ -21,7 +21,9 @@ use std::cell::Cell; use oxc_allocator::Vec; use oxc_syntax::scope::{ScopeFlags, ScopeId}; -use crate::{ast::*, ast_kind::AstKind}; +#[allow(clippy::wildcard_imports)] +use crate::ast::*; +use crate::ast_kind::AstKind; use walk::*; diff --git a/crates/oxc_ast/src/generated/visit_mut.rs b/crates/oxc_ast/src/generated/visit_mut.rs index fb7a3ab8d33a8..066f12adf4507 100644 --- a/crates/oxc_ast/src/generated/visit_mut.rs +++ b/crates/oxc_ast/src/generated/visit_mut.rs @@ -21,7 +21,9 @@ use std::cell::Cell; use oxc_allocator::Vec; use oxc_syntax::scope::{ScopeFlags, ScopeId}; -use crate::{ast::*, ast_kind::AstType}; +#[allow(clippy::wildcard_imports)] +use crate::ast::*; +use crate::ast_kind::AstType; use walk_mut::*; diff --git a/tasks/ast_codegen/src/generators/assert_layouts.rs b/tasks/ast_codegen/src/generators/assert_layouts.rs index 054207b076a53..bd1bfc2a005e7 100644 --- a/tasks/ast_codegen/src/generators/assert_layouts.rs +++ b/tasks/ast_codegen/src/generators/assert_layouts.rs @@ -36,10 +36,7 @@ impl Generator for AssertLayouts { use std::mem::{align_of, offset_of, size_of}; endl!(); - use oxc_span::*; - use oxc_syntax::{number::*, operator::*}; - endl!(); - + #[allow(clippy::wildcard_imports)] use crate::ast::*; endl!(); diff --git a/tasks/ast_codegen/src/generators/ast_builder.rs b/tasks/ast_codegen/src/generators/ast_builder.rs index 3718476f18300..b18f738696ff2 100644 --- a/tasks/ast_codegen/src/generators/ast_builder.rs +++ b/tasks/ast_codegen/src/generators/ast_builder.rs @@ -45,13 +45,6 @@ impl Generator for AstBuilderGenerator { endl!(); use oxc_allocator::{Allocator, Box, IntoIn, Vec}; - use oxc_span::{Atom, SourceType, Span}; - use oxc_syntax::{ - number::{BigintBase, NumberBase}, - operator::{ - AssignmentOperator, BinaryOperator, LogicalOperator, UnaryOperator, UpdateOperator, - }, - }; endl!(); #[allow(clippy::wildcard_imports)] diff --git a/tasks/ast_codegen/src/generators/ast_kind.rs b/tasks/ast_codegen/src/generators/ast_kind.rs index dd1dcf64eaeb4..c4cf890c21fee 100644 --- a/tasks/ast_codegen/src/generators/ast_kind.rs +++ b/tasks/ast_codegen/src/generators/ast_kind.rs @@ -170,6 +170,7 @@ impl Generator for AstKindGenerator { use oxc_span::{GetSpan, Span}; endl!(); + #[allow(clippy::wildcard_imports)] use crate::ast::*; endl!(); diff --git a/tasks/ast_codegen/src/generators/derive_clone_in.rs b/tasks/ast_codegen/src/generators/derive_clone_in.rs index db41c58aaf3ab..6e43ceeea6074 100644 --- a/tasks/ast_codegen/src/generators/derive_clone_in.rs +++ b/tasks/ast_codegen/src/generators/derive_clone_in.rs @@ -38,6 +38,7 @@ impl Generator for DeriveCloneIn { use oxc_allocator::{Allocator, CloneIn}; endl!(); + #[allow(clippy::wildcard_imports)] use crate::ast::*; endl!(); diff --git a/tasks/ast_codegen/src/generators/derive_get_span.rs b/tasks/ast_codegen/src/generators/derive_get_span.rs index ac77c6f47400d..12e6ebd0c5276 100644 --- a/tasks/ast_codegen/src/generators/derive_get_span.rs +++ b/tasks/ast_codegen/src/generators/derive_get_span.rs @@ -74,9 +74,10 @@ fn derive( insert!("#![allow(clippy::match_same_arms)]"); endl!(); - use oxc_span::{#trait_ident, Span}; + use oxc_span::#trait_ident; endl!(); + #[allow(clippy::wildcard_imports)] use crate::ast::*; endl!(); diff --git a/tasks/ast_codegen/src/generators/visit.rs b/tasks/ast_codegen/src/generators/visit.rs index 8ba8e4ecd7d32..fe9856a18d69e 100644 --- a/tasks/ast_codegen/src/generators/visit.rs +++ b/tasks/ast_codegen/src/generators/visit.rs @@ -104,7 +104,9 @@ fn generate_visit(ctx: &LateCtx) -> TokenStream { use oxc_syntax::scope::{ScopeFlags, ScopeId}; endl!(); - use crate::{ast::*, ast_kind::#ast_kind_type}; + #[allow(clippy::wildcard_imports)] + use crate::ast::*; + use crate::ast_kind::#ast_kind_type; endl!(); use #walk_mod::*;