From dcc1f2bcb3d7cb0cf9afb08aba7ead3b48e4eb47 Mon Sep 17 00:00:00 2001 From: Boshen <1430279+Boshen@users.noreply.github.com> Date: Tue, 21 Jan 2025 11:09:53 +0000 Subject: [PATCH] refactor(minifier): rename `ast_passes` to `peephole` (#8635) --- crates/oxc_minifier/src/compressor.rs | 3 +-- crates/oxc_minifier/src/lib.rs | 2 +- .../collapse_variable_declarations.rs | 0 .../convert_to_dotted_properties.rs | 0 .../fold_constants.rs} | 0 .../minimize_conditions.rs} | 0 .../{ast_passes => peephole}/minimize_exit_points.rs | 0 .../oxc_minifier/src/{ast_passes => peephole}/mod.rs | 10 +++++----- .../src/{ast_passes => peephole}/normalize.rs | 0 .../remove_dead_code.rs} | 0 .../replace_known_methods.rs} | 0 .../src/{ast_passes => peephole}/statement_fusion.rs | 0 .../substitute_alternate_syntax.rs} | 0 13 files changed, 7 insertions(+), 8 deletions(-) rename crates/oxc_minifier/src/{ast_passes => peephole}/collapse_variable_declarations.rs (100%) rename crates/oxc_minifier/src/{ast_passes => peephole}/convert_to_dotted_properties.rs (100%) rename crates/oxc_minifier/src/{ast_passes/peephole_fold_constants.rs => peephole/fold_constants.rs} (100%) rename crates/oxc_minifier/src/{ast_passes/peephole_minimize_conditions.rs => peephole/minimize_conditions.rs} (100%) rename crates/oxc_minifier/src/{ast_passes => peephole}/minimize_exit_points.rs (100%) rename crates/oxc_minifier/src/{ast_passes => peephole}/mod.rs (97%) rename crates/oxc_minifier/src/{ast_passes => peephole}/normalize.rs (100%) rename crates/oxc_minifier/src/{ast_passes/peephole_remove_dead_code.rs => peephole/remove_dead_code.rs} (100%) rename crates/oxc_minifier/src/{ast_passes/peephole_replace_known_methods.rs => peephole/replace_known_methods.rs} (100%) rename crates/oxc_minifier/src/{ast_passes => peephole}/statement_fusion.rs (100%) rename crates/oxc_minifier/src/{ast_passes/peephole_substitute_alternate_syntax.rs => peephole/substitute_alternate_syntax.rs} (100%) diff --git a/crates/oxc_minifier/src/compressor.rs b/crates/oxc_minifier/src/compressor.rs index e850a9f94..59df444b5 100644 --- a/crates/oxc_minifier/src/compressor.rs +++ b/crates/oxc_minifier/src/compressor.rs @@ -4,7 +4,7 @@ use oxc_semantic::{ScopeTree, SemanticBuilder, SymbolTable}; use oxc_traverse::ReusableTraverseCtx; use crate::{ - ast_passes::{DeadCodeElimination, Normalize, NormalizeOptions, PeepholeOptimizations}, + peephole::{DeadCodeElimination, Normalize, NormalizeOptions, PeepholeOptimizations}, CompressOptions, }; @@ -31,7 +31,6 @@ impl<'a> Compressor<'a> { program: &mut Program<'a>, ) { let mut ctx = ReusableTraverseCtx::new(scopes, symbols, self.allocator); - // RemoveUnusedCode::new(self.options).build(program, &mut ctx); let normalize_options = NormalizeOptions { convert_while_to_fors: true }; Normalize::new(normalize_options, self.options).build(program, &mut ctx); PeepholeOptimizations::new(self.options.target, true).run_in_loop(program, &mut ctx); diff --git a/crates/oxc_minifier/src/lib.rs b/crates/oxc_minifier/src/lib.rs index 9f5084e42..6904b981b 100644 --- a/crates/oxc_minifier/src/lib.rs +++ b/crates/oxc_minifier/src/lib.rs @@ -1,10 +1,10 @@ //! ECMAScript Minifier -mod ast_passes; mod compressor; mod ctx; mod keep_var; mod options; +mod peephole; #[cfg(test)] mod tester; diff --git a/crates/oxc_minifier/src/ast_passes/collapse_variable_declarations.rs b/crates/oxc_minifier/src/peephole/collapse_variable_declarations.rs similarity index 100% rename from crates/oxc_minifier/src/ast_passes/collapse_variable_declarations.rs rename to crates/oxc_minifier/src/peephole/collapse_variable_declarations.rs diff --git a/crates/oxc_minifier/src/ast_passes/convert_to_dotted_properties.rs b/crates/oxc_minifier/src/peephole/convert_to_dotted_properties.rs similarity index 100% rename from crates/oxc_minifier/src/ast_passes/convert_to_dotted_properties.rs rename to crates/oxc_minifier/src/peephole/convert_to_dotted_properties.rs diff --git a/crates/oxc_minifier/src/ast_passes/peephole_fold_constants.rs b/crates/oxc_minifier/src/peephole/fold_constants.rs similarity index 100% rename from crates/oxc_minifier/src/ast_passes/peephole_fold_constants.rs rename to crates/oxc_minifier/src/peephole/fold_constants.rs diff --git a/crates/oxc_minifier/src/ast_passes/peephole_minimize_conditions.rs b/crates/oxc_minifier/src/peephole/minimize_conditions.rs similarity index 100% rename from crates/oxc_minifier/src/ast_passes/peephole_minimize_conditions.rs rename to crates/oxc_minifier/src/peephole/minimize_conditions.rs diff --git a/crates/oxc_minifier/src/ast_passes/minimize_exit_points.rs b/crates/oxc_minifier/src/peephole/minimize_exit_points.rs similarity index 100% rename from crates/oxc_minifier/src/ast_passes/minimize_exit_points.rs rename to crates/oxc_minifier/src/peephole/minimize_exit_points.rs diff --git a/crates/oxc_minifier/src/ast_passes/mod.rs b/crates/oxc_minifier/src/peephole/mod.rs similarity index 97% rename from crates/oxc_minifier/src/ast_passes/mod.rs rename to crates/oxc_minifier/src/peephole/mod.rs index ede26831a..2f6ffd046 100644 --- a/crates/oxc_minifier/src/ast_passes/mod.rs +++ b/crates/oxc_minifier/src/peephole/mod.rs @@ -5,14 +5,14 @@ use oxc_traverse::{traverse_mut_with_ctx, ReusableTraverseCtx, Traverse, Travers mod collapse_variable_declarations; mod convert_to_dotted_properties; +mod fold_constants; +mod minimize_conditions; mod minimize_exit_points; mod normalize; -mod peephole_fold_constants; -mod peephole_minimize_conditions; -mod peephole_remove_dead_code; -mod peephole_replace_known_methods; -mod peephole_substitute_alternate_syntax; +mod remove_dead_code; +mod replace_known_methods; mod statement_fusion; +mod substitute_alternate_syntax; pub use normalize::{Normalize, NormalizeOptions}; diff --git a/crates/oxc_minifier/src/ast_passes/normalize.rs b/crates/oxc_minifier/src/peephole/normalize.rs similarity index 100% rename from crates/oxc_minifier/src/ast_passes/normalize.rs rename to crates/oxc_minifier/src/peephole/normalize.rs diff --git a/crates/oxc_minifier/src/ast_passes/peephole_remove_dead_code.rs b/crates/oxc_minifier/src/peephole/remove_dead_code.rs similarity index 100% rename from crates/oxc_minifier/src/ast_passes/peephole_remove_dead_code.rs rename to crates/oxc_minifier/src/peephole/remove_dead_code.rs diff --git a/crates/oxc_minifier/src/ast_passes/peephole_replace_known_methods.rs b/crates/oxc_minifier/src/peephole/replace_known_methods.rs similarity index 100% rename from crates/oxc_minifier/src/ast_passes/peephole_replace_known_methods.rs rename to crates/oxc_minifier/src/peephole/replace_known_methods.rs diff --git a/crates/oxc_minifier/src/ast_passes/statement_fusion.rs b/crates/oxc_minifier/src/peephole/statement_fusion.rs similarity index 100% rename from crates/oxc_minifier/src/ast_passes/statement_fusion.rs rename to crates/oxc_minifier/src/peephole/statement_fusion.rs diff --git a/crates/oxc_minifier/src/ast_passes/peephole_substitute_alternate_syntax.rs b/crates/oxc_minifier/src/peephole/substitute_alternate_syntax.rs similarity index 100% rename from crates/oxc_minifier/src/ast_passes/peephole_substitute_alternate_syntax.rs rename to crates/oxc_minifier/src/peephole/substitute_alternate_syntax.rs