From c945fe71b38a005333387f7dc84fcacd345d2916 Mon Sep 17 00:00:00 2001 From: overlookmotel <557937+overlookmotel@users.noreply.github.com> Date: Tue, 29 Oct 2024 13:00:49 +0000 Subject: [PATCH] refactor(transformer): import `oxc_allocator::Box` as `ArenaBox` (#6999) Closes #6996. --- .../src/es2017/async_to_generator.rs | 22 +++++++++---------- .../oxc_transformer/src/jsx/display_name.rs | 4 ++-- .../oxc_transformer/src/typescript/module.rs | 4 ++-- .../src/typescript/namespace.rs | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/crates/oxc_transformer/src/es2017/async_to_generator.rs b/crates/oxc_transformer/src/es2017/async_to_generator.rs index 12ca8f21232e4..ea22f327a94df 100644 --- a/crates/oxc_transformer/src/es2017/async_to_generator.rs +++ b/crates/oxc_transformer/src/es2017/async_to_generator.rs @@ -53,7 +53,7 @@ use std::mem; -use oxc_allocator::Box; +use oxc_allocator::Box as ArenaBox; use oxc_ast::{ast::*, Visit, NONE}; use oxc_semantic::{ReferenceFlags, ScopeFlags, ScopeId, SymbolFlags}; use oxc_span::{Atom, GetSpan, SPAN}; @@ -467,8 +467,8 @@ impl<'a, 'ctx> AsyncToGenerator<'a, 'ctx> { #[inline] fn create_function( id: Option>, - params: Box<'a, FormalParameters<'a>>, - body: Box<'a, FunctionBody<'a>>, + params: ArenaBox<'a, FormalParameters<'a>>, + body: ArenaBox<'a, FunctionBody<'a>>, scope_id: ScopeId, ctx: &mut TraverseCtx<'a>, ) -> Function<'a> { @@ -536,8 +536,8 @@ impl<'a, 'ctx> AsyncToGenerator<'a, 'ctx> { /// ``` fn create_async_to_generator_call( &self, - params: Box<'a, FormalParameters<'a>>, - body: Box<'a, FunctionBody<'a>>, + params: ArenaBox<'a, FormalParameters<'a>>, + body: ArenaBox<'a, FunctionBody<'a>>, scope_id: ScopeId, ctx: &mut TraverseCtx<'a>, ) -> Expression<'a> { @@ -560,8 +560,8 @@ impl<'a, 'ctx> AsyncToGenerator<'a, 'ctx> { fn create_async_to_generator_declaration( &self, bound_ident: &BoundIdentifier<'a>, - params: Box<'a, FormalParameters<'a>>, - body: Box<'a, FunctionBody<'a>>, + params: ArenaBox<'a, FormalParameters<'a>>, + body: ArenaBox<'a, FunctionBody<'a>>, scope_id: ScopeId, ctx: &mut TraverseCtx<'a>, ) -> Statement<'a> { @@ -592,8 +592,8 @@ impl<'a, 'ctx> AsyncToGenerator<'a, 'ctx> { fn create_async_to_generator_assignment( &self, bound: &BoundIdentifier<'a>, - params: Box<'a, FormalParameters<'a>>, - body: Box<'a, FunctionBody<'a>>, + params: ArenaBox<'a, FormalParameters<'a>>, + body: ArenaBox<'a, FunctionBody<'a>>, scope_id: ScopeId, ctx: &mut TraverseCtx<'a>, ) -> Statement<'a> { @@ -613,7 +613,7 @@ impl<'a, 'ctx> AsyncToGenerator<'a, 'ctx> { params: &FormalParameters<'a>, scope_id: ScopeId, ctx: &mut TraverseCtx<'a>, - ) -> Box<'a, FormalParameters<'a>> { + ) -> ArenaBox<'a, FormalParameters<'a>> { let mut parameters = ctx.ast.vec_with_capacity(params.items.len()); for param in ¶ms.items { if param.pattern.kind.is_assignment_pattern() { @@ -636,7 +636,7 @@ impl<'a, 'ctx> AsyncToGenerator<'a, 'ctx> { /// Creates an empty [FormalParameters] with [FormalParameterKind::FormalParameter]. #[inline] - fn create_empty_params(ctx: &mut TraverseCtx<'a>) -> Box<'a, FormalParameters<'a>> { + fn create_empty_params(ctx: &mut TraverseCtx<'a>) -> ArenaBox<'a, FormalParameters<'a>> { ctx.ast.alloc_formal_parameters( SPAN, FormalParameterKind::FormalParameter, diff --git a/crates/oxc_transformer/src/jsx/display_name.rs b/crates/oxc_transformer/src/jsx/display_name.rs index 54ae8ee586c5e..249bd359ea60a 100644 --- a/crates/oxc_transformer/src/jsx/display_name.rs +++ b/crates/oxc_transformer/src/jsx/display_name.rs @@ -45,7 +45,7 @@ //! //! * Babel plugin implementation: -use oxc_allocator::Box; +use oxc_allocator::Box as ArenaBox; use oxc_ast::ast::*; use oxc_span::{Atom, SPAN}; use oxc_traverse::{Ancestor, Traverse, TraverseCtx}; @@ -133,7 +133,7 @@ impl<'a, 'ctx> ReactDisplayName<'a, 'ctx> { /// Get the object from `React.createClass({})` or `createReactClass({})` fn get_object_from_create_class<'b>( call_expr: &'b mut CallExpression<'a>, - ) -> Option<&'b mut Box<'a, ObjectExpression<'a>>> { + ) -> Option<&'b mut ArenaBox<'a, ObjectExpression<'a>>> { if match &call_expr.callee { callee @ match_member_expression!(Expression) => { !callee.to_member_expression().is_specific_member_access("React", "createClass") diff --git a/crates/oxc_transformer/src/typescript/module.rs b/crates/oxc_transformer/src/typescript/module.rs index 0762f756e9ac3..40aa7b31bdae5 100644 --- a/crates/oxc_transformer/src/typescript/module.rs +++ b/crates/oxc_transformer/src/typescript/module.rs @@ -1,4 +1,4 @@ -use oxc_allocator::Box; +use oxc_allocator::Box as ArenaBox; use oxc_ast::{ast::*, NONE}; use oxc_span::SPAN; use oxc_syntax::reference::ReferenceFlags; @@ -51,7 +51,7 @@ impl<'a, 'ctx> Traverse<'a> for TypeScriptModule<'a, 'ctx> { impl<'a, 'ctx> TypeScriptModule<'a, 'ctx> { fn transform_ts_import_equals( &self, - decl: &mut Box<'a, TSImportEqualsDeclaration<'a>>, + decl: &mut ArenaBox<'a, TSImportEqualsDeclaration<'a>>, ctx: &mut TraverseCtx<'a>, ) -> Declaration<'a> { let kind = VariableDeclarationKind::Var; diff --git a/crates/oxc_transformer/src/typescript/namespace.rs b/crates/oxc_transformer/src/typescript/namespace.rs index d8dafcd2afd78..3a4f99c6b6512 100644 --- a/crates/oxc_transformer/src/typescript/namespace.rs +++ b/crates/oxc_transformer/src/typescript/namespace.rs @@ -1,6 +1,6 @@ use rustc_hash::FxHashSet; -use oxc_allocator::{Box, Vec as ArenaVec}; +use oxc_allocator::{Box as ArenaBox, Vec as ArenaVec}; use oxc_ast::{ast::*, NONE}; use oxc_ecmascript::BoundNames; use oxc_span::{Atom, CompactStr, SPAN}; @@ -446,7 +446,7 @@ impl<'a, 'ctx> TypeScriptNamespace<'a, 'ctx> { /// Convert `export const foo = 1` to `Namespace.foo = 1`; #[allow(clippy::needless_pass_by_value)] fn handle_variable_declaration( - mut var_decl: Box<'a, VariableDeclaration<'a>>, + mut var_decl: ArenaBox<'a, VariableDeclaration<'a>>, name: Atom<'a>, ctx: &TraverseCtx<'a>, ) -> ArenaVec<'a, Statement<'a>> {