Skip to content
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

Jump to bottom

refactor(ast, ast_codegen): use generate_derive for implementing GetSpan and GetSpanMut traits. #4735

Merged
merged 1 commit into from
Aug 7, 2024
Merged

refactor(ast, ast_codegen): use generate_derive for implementing GetSpan and GetSpanMut traits. #4735

merged 1 commit into from
Aug 7, 2024

Conversation

rzvxa
Copy link
Contributor

@rzvxa rzvxa commented Aug 7, 2024

No description provided.

This was referenced Aug 7, 2024
Merged
Merged
Merged
@github-actions github-actions bot added the A-ast Area - AST label Aug 7, 2024
This was referenced Aug 7, 2024
Merged
Merged
@rzvxa Graphite App
Copy link
Contributor Author

rzvxa commented Aug 7, 2024 •
edited
Loading

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @rzvxa and the rest of your teammates on Graphite Graphite

@rzvxa rzvxa mentioned this pull request Aug 7, 2024
Merged
@codspeed-hq CodSpeed HQ
Copy link

codspeed-hq bot commented Aug 7, 2024 •
edited
Loading

CodSpeed Performance Report

Merging #4735 will not alter performance

Comparing 08-07-refactor_ast_ast_codegen_use_generate_derive_for_implementing_getspan_and_getspanmut_traits (2218340) with main (579b797)

Summary

✅ 29 untouched benchmarks

@rzvxa rzvxa force-pushed the 08-07-feat_ast_derive_clonein_for_ast_types_using_generate_derive_ branch from ef367f5 to e279d35 Compare August 7, 2024 15:53
@rzvxa rzvxa force-pushed the 08-07-refactor_ast_ast_codegen_use_generate_derive_for_implementing_getspan_and_getspanmut_traits branch from 7eff3d8 to 13d92f6 Compare August 7, 2024 15:54
@rzvxa rzvxa force-pushed the 08-07-feat_ast_derive_clonein_for_ast_types_using_generate_derive_ branch from e279d35 to 9817c90 Compare August 7, 2024 16:12
@rzvxa rzvxa force-pushed the 08-07-refactor_ast_ast_codegen_use_generate_derive_for_implementing_getspan_and_getspanmut_traits branch from 13d92f6 to ba9cfe9 Compare August 7, 2024 16:12
@rzvxa rzvxa force-pushed the 08-07-feat_ast_derive_clonein_for_ast_types_using_generate_derive_ branch from 9817c90 to 55fb503 Compare August 7, 2024 16:15
@rzvxa rzvxa force-pushed the 08-07-refactor_ast_ast_codegen_use_generate_derive_for_implementing_getspan_and_getspanmut_traits branch 2 times, most recently from 5d1d509 to 6876a58 Compare August 7, 2024 16:16
@rzvxa rzvxa force-pushed the 08-07-feat_ast_derive_clonein_for_ast_types_using_generate_derive_ branch from a523308 to 54da9e3 Compare August 7, 2024 16:24
@rzvxa rzvxa force-pushed the 08-07-refactor_ast_ast_codegen_use_generate_derive_for_implementing_getspan_and_getspanmut_traits branch from 6876a58 to f7ad0ba Compare August 7, 2024 16:24
@rzvxa rzvxa marked this pull request as ready for review August 7, 2024 16:30
@rzvxa
Copy link
Contributor Author

rzvxa commented Aug 7, 2024

@Boshen I saw your comment on using #[generate_derive(GetSpan)] a tad bit late. Do you want me to refactor it?

@rzvxa rzvxa mentioned this pull request Aug 7, 2024
Merged
@rzvxa rzvxa force-pushed the 08-07-feat_ast_derive_clonein_for_ast_types_using_generate_derive_ branch from 54da9e3 to 8d63f28 Compare August 7, 2024 17:41
@rzvxa rzvxa mentioned this pull request Aug 7, 2024
Merged
@overlookmotel overlookmotel force-pushed the 08-07-refactor_ast_ast_codegen_use_generate_derive_for_implementing_getspan_and_getspanmut_traits branch from e07f720 to 2acb977 Compare August 7, 2024 17:44
@rzvxa rzvxa force-pushed the 08-07-refactor_ast_ast_codegen_use_generate_derive_for_implementing_getspan_and_getspanmut_traits branch from 2acb977 to ad4d955 Compare August 7, 2024 17:45
@rzvxa rzvxa changed the base branch from 08-07-feat_ast_derive_clonein_for_ast_types_using_generate_derive_ to 08-07-refactor_ast_use_type_identifier_instead_of_clonein_cloned_gat August 7, 2024 17:45
@rzvxa rzvxa mentioned this pull request Aug 7, 2024
Closed
@overlookmotel overlookmotel force-pushed the 08-07-refactor_ast_use_type_identifier_instead_of_clonein_cloned_gat branch from 946e50d to 49cb41c Compare August 7, 2024 20:35
@overlookmotel overlookmotel force-pushed the 08-07-refactor_ast_ast_codegen_use_generate_derive_for_implementing_getspan_and_getspanmut_traits branch from ad4d955 to cdc8619 Compare August 7, 2024 20:35
@overlookmotel overlookmotel force-pushed the 08-07-refactor_ast_use_type_identifier_instead_of_clonein_cloned_gat branch from 49cb41c to cb8d13e Compare August 7, 2024 21:18
@overlookmotel overlookmotel changed the base branch from 08-07-refactor_ast_use_type_identifier_instead_of_clonein_cloned_gat to graphite-base/4735 August 7, 2024 21:23
@overlookmotel overlookmotel force-pushed the 08-07-refactor_ast_ast_codegen_use_generate_derive_for_implementing_getspan_and_getspanmut_traits branch from cdc8619 to 20fbe55 Compare August 7, 2024 21:26
@overlookmotel overlookmotel changed the base branch from graphite-base/4735 to main August 7, 2024 21:27
@rzvxa rzvxa force-pushed the 08-07-refactor_ast_ast_codegen_use_generate_derive_for_implementing_getspan_and_getspanmut_traits branch from 20fbe55 to 83a2fb7 Compare August 7, 2024 21:30
overlookmotel
overlookmotel approved these changes Aug 7, 2024
View reviewed changes
Copy link
Contributor

@overlookmotel overlookmotel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In my opinion, the code style here is a bit convoluted. But let's merge and I'll make a tidy-up PR later on so we can discuss whether my proposed changes are better or not.

@overlookmotel overlookmotel added the 0-merge Merge with Graphite Merge Queue label Aug 7, 2024
@graphite-app Graphite App
Copy link

graphite-app bot commented Aug 7, 2024 •
edited
Loading

Merge activity

  • Aug 7, 6:06 PM EDT: The merge label 'merge' was detected. This PR will be added to the Graphite merge queue once it meets the requirements.
  • Aug 7, 6:07 PM EDT: overlookmotel added this pull request to the Graphite merge queue.
  • Aug 7, 6:10 PM EDT: overlookmotel merged this pull request with the Graphite merge queue.

@overlookmotel overlookmotel force-pushed the 08-07-refactor_ast_ast_codegen_use_generate_derive_for_implementing_getspan_and_getspanmut_traits branch from fba509f to 2218340 Compare August 7, 2024 22:07
@graphite-app graphite-app bot merged commit 2218340 into main Aug 7, 2024
24 checks passed
@graphite-app graphite-app bot deleted the 08-07-refactor_ast_ast_codegen_use_generate_derive_for_implementing_getspan_and_getspanmut_traits branch August 7, 2024 22:10
@rzvxa rzvxa mentioned this pull request Aug 8, 2024
Merged
@oxc-bot oxc-bot mentioned this pull request Aug 8, 2024
Merged
Boshen added a commit that referenced this pull request Aug 8, 2024
@oxc-bot @Boshen
Release crates v0.24.0 (#4749)
69dc6c9 
## [0.24.0] - 2024-08-08

- 75f2207 traverse: [**BREAKING**] Replace `find_scope` with
`ancestor_scopes` returning iterator (#4693) (overlookmotel)

- 506709f traverse: [**BREAKING**] Replace `find_ancestor` with
`ancestors` returning iterator (#4692) (overlookmotel)

### Features

- 23b0040 allocator: Introduce `CloneIn` trait. (#4726) (rzvxa)
- 51c1ca0 ast: Derive `CloneIn` for AST types, using `generate_derive`.
(#4732) (rzvxa)
- e12bd1e ast: Allow conversion from TSAccessibility into &'static str
(#4711) (DonIsaac)
- fd2d9da ast: Improve `AstKind::debug_name` (#4553) (DonIsaac)
- b3b7028 ast: Implement missing Clone, Hash, and Display traits for
literals (#4552) (DonIsaac)
- 54047e0 ast: `GetSpanMut` trait (#4609) (overlookmotel)
- eae401c ast, ast_macros: Apply stable repr to all `#[ast]` enums
(#4373) (rzvxa)
- ec0b4cb ast_codegen: Add `derive_clone_in` generator. (#4731) (rzvxa)
- 2e91ad6 ast_codegen: Support for `generate_derive` marker. (#4728)
(rzvxa)
- 82e2f6b ast_codegen: Process AST-related `syntax` types. (#4694)
(rzvxa)
- 0c52c0d ast_codegen: Add alignment and size data to the schema.
(#4615) (rzvxa)
- 07607d3 ast_codegen, span: Process `Span` through ast_codegen (#4703)
(overlookmotel)
- 125c5fd ast_codegen, span: Process `SourceType` through ast_codegen.
(#4696) (rzvxa)
- eaddc8f linter: Add fixer for eslint/func_names (#4714) (DonIsaac)
- 229a0e9 minifier: Implement dot define for member expressions (#3959)
(camc314)
- 33f1312 semantic: Impl GetSpan for AstNode (#4717) (DonIsaac)
- e42ac3a sourcemap: Add `ConcatSourceMapBuilder::from_sourcemaps`
(#4639) (overlookmotel)
- 2e63618 span: Implement `CloneIn` for the AST-related items. (#4729)
(rzvxa)
- 6a36616 syntax: Derive `CloneIn` for the AST-related items. (#4730)
(rzvxa)

### Bug Fixes

- 4a56954 codegen: Print raw if value is number is Infinity (#4676)
(Boshen)
- 94d3c31 minifier: Avoid removing function declaration from `KeepVar`
(#4722) (Boshen)
- bf43148 minifier: Do not `remove_syntax` in dead_code_elimination
(Boshen)
- bf48c7f minifier: Fix `keep_var` keeping vars from arrow functions
(#4680) (Boshen)
- 9be29af minifier: Temporarily fix shadowed `undefined` variable
(#4678) (Boshen)
- e8b662a minifier: Various fixes to pass minifier conformance (#4667)
(Boshen)
- 01d85de napi/transform: Update napi files (Boshen)
- f290191 oxc_ast_macros: Fix `syn` lacking features to build (Boshen)
- a40a217 parser: Parse `assert` keyword in `TSImportAttributes` (#4610)
(Boshen)
- 03c643a semantic: Incorrect `scope_id` for catch parameter symbols
(#4659) (Dunqing)
- 6c612d1 semantic/jsdoc: Handle whitespace absence (#4642) (leaysgur)
- 0d2c41a semantic/jsdoc: Panic on parsing `type_name_comment`. (#4632)
(rzvxa)
- 9f8f299 syntax: Prevent creating invalid u32 IDs (#4675)
(overlookmotel)
- 4797eaa transformer: Strip TS statements from for in/of statement
bodies (#4686) (overlookmotel)
- 5327acd transformer/react: The `require` IdentifierReference does not
have a `reference_id` (#4658) (Dunqing)
- 3987665 transformer/typescript: Incorrect enum-related
`symbol_id`/`reference_id` (#4660) (Dunqing)
- 4efd54b transformer/typescript: Incorrect `SymbolFlags` for jsx
imports (#4549) (Dunqing)

### Performance

- 8dd76e4 codegen: Reduce size of `LineOffsetTable` (#4643)
(overlookmotel)
- b8e6753 codegen: `u32` indexes in `LineOffsetTable` for source maps
(#4641) (overlookmotel)
- 6ff200d linter: Change react rules and utils to use `Cow` and
`CompactStr` instead of `String` (#4603) (DonIsaac)
- 0f5e982 minifier: Only visit arrow expression after dropping
`console.log` (#4677) (Boshen)
- ff43dff sourcemap: Speed up VLQ encoding (#4633) (overlookmotel)
- a330773 sourcemap: Reduce string copying in `ConcatSourceMapBuilder`
(#4638) (overlookmotel)
- 372316b sourcemap: `ConcatSourceMapBuilder` extend `source_contents`
in separate loop (#4634) (overlookmotel)
- c7f1d48 sourcemap: Keep local copy of previous token in VLQ encode
(#4596) (overlookmotel)
- 590d795 sourcemap: Shorten main loop encoding VLQ (#4586)
(overlookmotel)

### Documentation

- c69ada4 ast: Improve AST node documentation (#4051) (Rintaro Itokawa)

### Refactor

- 579b797 ast: Use type identifier instead of `CloneIn::Cloned` GAT.
(#4738) (rzvxa)
- 475266d ast: Use correct lifetimes for name-related methods (#4712)
(DonIsaac)
- 83b6ca9 ast: Add explicit enum discriminants. (#4689) (rzvxa)
- ba70001 ast: Put `assert_layouts.rs` behind `debug_assertions` (#4621)
(rzvxa)
- 3f53b6f ast: Make AST structs `repr(C)`. (#4614) (rzvxa)
- 452e0ee ast: Remove defunct `visit_as` + `visit_args` attrs from
`#[ast]` macro (#4599) (overlookmotel)
- 2218340 ast, ast_codegen: Use `generate_derive` for implementing
`GetSpan` and `GetSpanMut` traits. (#4735) (rzvxa)
- fbfd852 minifier: Add `NodeUtil` trait for accessing symbols on ast
nodes (#4734) (Boshen)
- e0832f8 minifier: Use `oxc_traverse` for AST passes (#4725) (Boshen)
- 17602db minifier: Move tests and files around (Boshen)
- 3289477 minifier: Clean up tests (#4724) (Boshen)
- e78cba6 minifier: Ast passes infrastructure (#4625) (Boshen)
- d25dea7 parser: Use `ast_builder` in more places. (#4612) (rzvxa)
- 09d9822 semantic: Simplify setting scope flags (#4674) (overlookmotel)
- 6e453db semantic: Simplify inherit scope flags from parent scope
(#4664) (Dunqing)
- e1429e5 span: Reduce #[cfg_attr] boilerplate in type defs (#4702)
(overlookmotel)
- e24fb5b syntax: Add explicit enum discriminants to AST related types.
(#4691) (rzvxa)
- 3f3cb62 syntax, span: Reduce #[cfg_attr] boilerplate in type defs
(#4698) (overlookmotel)
- 54f9897 traverse: Simpler code for entering/exiting unconditional
scopes (#4685) (overlookmotel)
- 83546d3 traverse: Enter node before entering scope (#4684)
(overlookmotel)- 9b51e04 Overhaul napi transformer package (#4592)
(DonIsaac)

### Testing

- 49d5196 ast: Fix `assert_layouts.rs` offset tests on 32bit platforms.
(#4620) (rzvxa)

Co-authored-by: Boshen <[email protected]>
@overlookmotel overlookmotel mentioned this pull request Aug 8, 2024
Merged
rzvxa pushed a commit that referenced this pull request Aug 8, 2024
@overlookmotel
refactor(ast_codegen): simplify derive_get_span generator (#4757)
790c551 
Simplify `derive_get_span` generator that was introduced in #4735. No change to functionality, just aiming for greater readability.

In particular:

* Move defining idents/tokens which are specific to `GetSpan` / `GetSpanMut` into those specific generators, rather than branching on `MUT` later on.
* Remove `const MUT` param.
* Remove the confusing pairs of closures and functions both called `derive_enum` / `derive_struct`.
* Inline function which generates the impls - prioritizing readability over DRY code.
overlookmotel pushed a commit that referenced this pull request Aug 8, 2024
@rzvxa
fix(ast, ast_codegen): use generate_derive instead of visitable for…
fff9da3 
… generating span derives. (#4747)

follow-up to #4735
I was accidentally using the old code to filter the viable target types to derive. It means before this PR we were still using the `#[ast(visit)]` for this purpose.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@overlookmotel overlookmotel overlookmotel approved these changes

Assignees
No one assigned
Labels
0-merge Merge with Graphite Merge Queue A-ast Area - AST
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rzvxa @overlookmotel