Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/oxc_ast/src/ast/js.rs
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ pub struct TaggedTemplateExpression<'a> {
#[serde(flatten)]
pub span: Span,
pub tag: Expression<'a>,
pub quasi: Box<'a, TemplateLiteral<'a>>,
pub quasi: TemplateLiteral<'a>,
pub type_parameters: Option<Box<'a, TSTypeParameterInstantiation<'a>>>,
}

Expand Down
8 changes: 4 additions & 4 deletions crates/oxc_ast/src/generated/assert_layouts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@ const _: () = {
assert!(offset_of!(TemplateLiteral, quasis) == 8usize);
assert!(offset_of!(TemplateLiteral, expressions) == 40usize);

assert!(size_of::<TaggedTemplateExpression>() == 40usize);
assert!(size_of::<TaggedTemplateExpression>() == 104usize);
assert!(align_of::<TaggedTemplateExpression>() == 8usize);
assert!(offset_of!(TaggedTemplateExpression, span) == 0usize);
assert!(offset_of!(TaggedTemplateExpression, tag) == 8usize);
assert!(offset_of!(TaggedTemplateExpression, quasi) == 24usize);
assert!(offset_of!(TaggedTemplateExpression, type_parameters) == 32usize);
assert!(offset_of!(TaggedTemplateExpression, type_parameters) == 96usize);

assert!(size_of::<TemplateElement>() == 48usize);
assert!(align_of::<TemplateElement>() == 8usize);
Expand Down Expand Up @@ -1693,12 +1693,12 @@ const _: () = {
assert!(offset_of!(TemplateLiteral, quasis) == 8usize);
assert!(offset_of!(TemplateLiteral, expressions) == 24usize);

assert!(size_of::<TaggedTemplateExpression>() == 24usize);
assert!(size_of::<TaggedTemplateExpression>() == 60usize);
assert!(align_of::<TaggedTemplateExpression>() == 4usize);
assert!(offset_of!(TaggedTemplateExpression, span) == 0usize);
assert!(offset_of!(TaggedTemplateExpression, tag) == 8usize);
assert!(offset_of!(TaggedTemplateExpression, quasi) == 16usize);
assert!(offset_of!(TaggedTemplateExpression, type_parameters) == 20usize);
assert!(offset_of!(TaggedTemplateExpression, type_parameters) == 56usize);

assert!(size_of::<TemplateElement>() == 28usize);
assert!(align_of::<TemplateElement>() == 4usize);
Expand Down
29 changes: 13 additions & 16 deletions crates/oxc_ast/src/generated/ast_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1075,16 +1075,15 @@ impl<'a> AstBuilder<'a> {
/// - quasi
/// - type_parameters
#[inline]
pub fn expression_tagged_template<T1, T2>(
pub fn expression_tagged_template<T1>(
self,
span: Span,
tag: Expression<'a>,
quasi: T1,
type_parameters: T2,
quasi: TemplateLiteral<'a>,
type_parameters: T1,
) -> Expression<'a>
where
T1: IntoIn<'a, Box<'a, TemplateLiteral<'a>>>,
T2: IntoIn<'a, Option<Box<'a, TSTypeParameterInstantiation<'a>>>>,
T1: IntoIn<'a, Option<Box<'a, TSTypeParameterInstantiation<'a>>>>,
{
Expression::TaggedTemplateExpression(self.alloc(self.tagged_template_expression(
span,
Expand Down Expand Up @@ -1990,21 +1989,20 @@ impl<'a> AstBuilder<'a> {
/// - quasi
/// - type_parameters
#[inline]
pub fn tagged_template_expression<T1, T2>(
pub fn tagged_template_expression<T1>(
self,
span: Span,
tag: Expression<'a>,
quasi: T1,
type_parameters: T2,
quasi: TemplateLiteral<'a>,
type_parameters: T1,
) -> TaggedTemplateExpression<'a>
where
T1: IntoIn<'a, Box<'a, TemplateLiteral<'a>>>,
T2: IntoIn<'a, Option<Box<'a, TSTypeParameterInstantiation<'a>>>>,
T1: IntoIn<'a, Option<Box<'a, TSTypeParameterInstantiation<'a>>>>,
{
TaggedTemplateExpression {
span,
tag,
quasi: quasi.into_in(self.allocator),
quasi,
type_parameters: type_parameters.into_in(self.allocator),
}
}
Expand All @@ -2019,16 +2017,15 @@ impl<'a> AstBuilder<'a> {
/// - quasi
/// - type_parameters
#[inline]
pub fn alloc_tagged_template_expression<T1, T2>(
pub fn alloc_tagged_template_expression<T1>(
self,
span: Span,
tag: Expression<'a>,
quasi: T1,
type_parameters: T2,
quasi: TemplateLiteral<'a>,
type_parameters: T1,
) -> Box<'a, TaggedTemplateExpression<'a>>
where
T1: IntoIn<'a, Box<'a, TemplateLiteral<'a>>>,
T2: IntoIn<'a, Option<Box<'a, TSTypeParameterInstantiation<'a>>>>,
T1: IntoIn<'a, Option<Box<'a, TSTypeParameterInstantiation<'a>>>>,
{
Box::new_in(
self.tagged_template_expression(span, tag, quasi, type_parameters),
Expand Down
8 changes: 4 additions & 4 deletions crates/oxc_traverse/src/generated/ancestor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2612,10 +2612,10 @@ impl<'a, 't> TaggedTemplateExpressionWithoutTag<'a, 't> {
}

#[inline]
pub fn quasi(self) -> &'t Box<'a, TemplateLiteral<'a>> {
pub fn quasi(self) -> &'t TemplateLiteral<'a> {
unsafe {
&*((self.0 as *const u8).add(OFFSET_TAGGED_TEMPLATE_EXPRESSION_QUASI)
as *const Box<'a, TemplateLiteral<'a>>)
as *const TemplateLiteral<'a>)
}
}

Expand Down Expand Up @@ -2684,10 +2684,10 @@ impl<'a, 't> TaggedTemplateExpressionWithoutTypeParameters<'a, 't> {
}

#[inline]
pub fn quasi(self) -> &'t Box<'a, TemplateLiteral<'a>> {
pub fn quasi(self) -> &'t TemplateLiteral<'a> {
unsafe {
&*((self.0 as *const u8).add(OFFSET_TAGGED_TEMPLATE_EXPRESSION_QUASI)
as *const Box<'a, TemplateLiteral<'a>>)
as *const TemplateLiteral<'a>)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions crates/oxc_traverse/src/generated/walk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,8 @@ pub(crate) unsafe fn walk_tagged_template_expression<'a, Tr: Traverse<'a>>(
ctx.retag_stack(AncestorType::TaggedTemplateExpressionQuasi);
walk_template_literal(
traverser,
(&mut **((node as *mut u8).add(ancestor::OFFSET_TAGGED_TEMPLATE_EXPRESSION_QUASI)
as *mut Box<TemplateLiteral>)) as *mut _,
(node as *mut u8).add(ancestor::OFFSET_TAGGED_TEMPLATE_EXPRESSION_QUASI)
as *mut TemplateLiteral,
ctx,
);
if let Some(field) = &mut *((node as *mut u8)
Expand Down