Skip to content

refactor(ast/estree): simplify static converters #10197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
Apr 3, 2025
Merged

refactor(ast/estree): simplify static converters #10197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 24 additions & 24 deletions crates/oxc_ast/src/serialize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ impl ESTree for ProgramConverter<'_, '_> {
/// Serialized as `null`.
#[ast_meta]
#[estree(ts_type = "null", raw_deser = "null")]
pub struct Null<'b, T>(#[expect(dead_code)] pub &'b T);
pub struct Null<T>(pub T);

impl<T> ESTree for Null<'_, T> {
impl<T> ESTree for Null<T> {
fn serialize<S: Serializer>(&self, serializer: S) {
().serialize(serializer);
}
Expand All @@ -147,9 +147,9 @@ impl<T> ESTree for Null<'_, T> {
#[ast_meta]
#[estree(ts_type = "null", raw_deser = "null")]
#[ts]
pub struct TsNull<'b, T>(#[expect(dead_code)] pub &'b T);
pub struct TsNull<T>(pub T);

impl<T> ESTree for TsNull<'_, T> {
impl<T> ESTree for TsNull<T> {
fn serialize<S: Serializer>(&self, serializer: S) {
().serialize(serializer);
}
Expand All @@ -158,9 +158,9 @@ impl<T> ESTree for TsNull<'_, T> {
/// Serialized as `true`.
#[ast_meta]
#[estree(ts_type = "true", raw_deser = "true")]
pub struct True<'b, T>(#[expect(dead_code)] pub &'b T);
pub struct True<T>(pub T);

impl<T> ESTree for True<'_, T> {
impl<T> ESTree for True<T> {
fn serialize<S: Serializer>(&self, serializer: S) {
true.serialize(serializer);
}
Expand All @@ -169,9 +169,9 @@ impl<T> ESTree for True<'_, T> {
/// Serialized as `false`.
#[ast_meta]
#[estree(ts_type = "false", raw_deser = "false")]
pub struct False<'b, T>(#[expect(dead_code)] pub &'b T);
pub struct False<T>(pub T);

impl<T> ESTree for False<'_, T> {
impl<T> ESTree for False<T> {
fn serialize<S: Serializer>(&self, serializer: S) {
false.serialize(serializer);
}
Expand All @@ -180,9 +180,9 @@ impl<T> ESTree for False<'_, T> {
#[ast_meta]
#[estree(ts_type = "false", raw_deser = "false")]
#[ts]
pub struct TsFalse<'b, T>(#[expect(dead_code)] pub &'b T);
pub struct TsFalse<T>(pub T);

impl<T> ESTree for TsFalse<'_, T> {
impl<T> ESTree for TsFalse<T> {
fn serialize<S: Serializer>(&self, serializer: S) {
false.serialize(serializer);
}
Expand All @@ -192,9 +192,9 @@ impl<T> ESTree for TsFalse<'_, T> {
#[ast_meta]
#[estree(ts_type = "'value'", raw_deser = "'value'")]
#[ts]
pub struct TsValue<'b, T>(#[expect(dead_code)] pub &'b T);
pub struct TsValue<T>(pub T);

impl<T> ESTree for TsValue<'_, T> {
impl<T> ESTree for TsValue<T> {
fn serialize<S: Serializer>(&self, serializer: S) {
JsonSafeString("value").serialize(serializer);
}
Expand All @@ -203,9 +203,9 @@ impl<T> ESTree for TsValue<'_, T> {
/// Serialized as `"in"`.
#[ast_meta]
#[estree(ts_type = "'in'", raw_deser = "'in'")]
pub struct In<'b, T>(#[expect(dead_code)] pub &'b T);
pub struct In<T>(pub T);

impl<T> ESTree for In<'_, T> {
impl<T> ESTree for In<T> {
fn serialize<S: Serializer>(&self, serializer: S) {
JsonSafeString("in").serialize(serializer);
}
Expand All @@ -214,9 +214,9 @@ impl<T> ESTree for In<'_, T> {
/// Serialized as `"init"`.
#[ast_meta]
#[estree(ts_type = "'init'", raw_deser = "'init'")]
pub struct Init<'b, T>(#[expect(dead_code)] pub &'b T);
pub struct Init<T>(pub T);

impl<T> ESTree for Init<'_, T> {
impl<T> ESTree for Init<T> {
fn serialize<S: Serializer>(&self, serializer: S) {
JsonSafeString("init").serialize(serializer);
}
Expand All @@ -225,9 +225,9 @@ impl<T> ESTree for Init<'_, T> {
/// Serialized as `"this"`.
#[ast_meta]
#[estree(ts_type = "'this'", raw_deser = "'this'")]
pub struct This<'b, T>(#[expect(dead_code)] pub &'b T);
pub struct This<T>(pub T);

impl<T> ESTree for This<'_, T> {
impl<T> ESTree for This<T> {
fn serialize<S: Serializer>(&self, serializer: S) {
JsonSafeString("this").serialize(serializer);
}
Expand All @@ -236,9 +236,9 @@ impl<T> ESTree for This<'_, T> {
/// Serialized as `[]`.
#[ast_meta]
#[estree(ts_type = "[]", raw_deser = "[]")]
pub struct EmptyArray<'b, T>(#[expect(dead_code)] pub &'b T);
pub struct EmptyArray<T>(pub T);

impl<T> ESTree for EmptyArray<'_, T> {
impl<T> ESTree for EmptyArray<T> {
fn serialize<S: Serializer>(&self, serializer: S) {
[(); 0].serialize(serializer);
}
Expand All @@ -247,9 +247,9 @@ impl<T> ESTree for EmptyArray<'_, T> {
#[ast_meta]
#[estree(ts_type = "[]", raw_deser = "[]")]
#[ts]
pub struct TsEmptyArray<'b, T>(#[expect(dead_code)] pub &'b T);
pub struct TsEmptyArray<T>(pub T);

impl<T> ESTree for TsEmptyArray<'_, T> {
impl<T> ESTree for TsEmptyArray<T> {
fn serialize<S: Serializer>(&self, serializer: S) {
[(); 0].serialize(serializer);
}
Expand Down Expand Up @@ -532,8 +532,8 @@ impl ESTree for FormalParametersRest<'_, '_> {
state.serialize_field("argument", &rest.argument.kind);
state.serialize_ts_field("typeAnnotation", &rest.argument.type_annotation);
state.serialize_ts_field("optional", &rest.argument.optional);
state.serialize_ts_field("decorators", &EmptyArray(&()));
state.serialize_ts_field("value", &Null(&()));
state.serialize_ts_field("decorators", &EmptyArray(()));
state.serialize_ts_field("value", &Null(()));
state.end();
}
}
Expand Down
Loading