Skip to content

Commit e5e6a11

Browse files
hyf0hyf0
authored
Merge branch 'main' into 03-14-ci_should_do_matrix_out_side_of_reusable_workflows
2 parents 8d1f28b + 52e84dd commit e5e6a11

File tree

6 files changed

+21
-36
lines changed

6 files changed

+21
-36
lines changed

‎crates/rolldown/src/ast_scanner/mod.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use rolldown_common::{
3737
StmtInfoIdx, StmtInfoMeta, StmtInfos, SymbolRef, SymbolRefDbForModule, SymbolRefFlags,
3838
TaggedSymbolRef, ThisExprReplaceKind, generate_replace_this_expr_map,
3939
};
40-
use rolldown_ecmascript_utils::{BindingIdentifierExt, BindingPatternExt, FunctionExt};
40+
use rolldown_ecmascript_utils::{BindingPatternExt, FunctionExt};
4141
use rolldown_error::{BuildDiagnostic, BuildResult, CjsExportSpan};
4242
use rolldown_std_utils::PathExt;
4343
use rolldown_utils::concat_string;
@@ -728,7 +728,7 @@ impl<'me, 'ast: 'me> AstScanner<'me, 'ast> {
728728
ast::Declaration::VariableDeclaration(var_decl) => {
729729
var_decl.declarations.iter().for_each(|decl| {
730730
decl.id.binding_identifiers().into_iter().for_each(|id| {
731-
self.add_local_export(&id.name, id.expect_symbol_id(), id.span);
731+
self.add_local_export(&id.name, id.symbol_id(), id.span);
732732
});
733733
if let BindingPattern::BindingIdentifier(ref binding) = decl.id {
734734
let symbol_id = binding.symbol_id();
@@ -764,7 +764,7 @@ impl<'me, 'ast: 'me> AstScanner<'me, 'ast> {
764764
}
765765
ast::Declaration::FunctionDeclaration(fn_decl) => {
766766
let binding_id = fn_decl.id.as_ref().unwrap();
767-
let symbol_id = binding_id.expect_symbol_id();
767+
let symbol_id = binding_id.symbol_id();
768768
self.add_local_export(binding_id.name.as_str(), symbol_id, binding_id.span);
769769
if fn_decl.is_side_effect_free() || fn_decl.pure {
770770
self.result.ecma_view_meta.insert(EcmaViewMeta::TopExportedSideEffectsFreeFunction);
@@ -779,7 +779,7 @@ impl<'me, 'ast: 'me> AstScanner<'me, 'ast> {
779779
}
780780
ast::Declaration::ClassDeclaration(cls_decl) => {
781781
let id = cls_decl.id.as_ref().unwrap();
782-
self.add_local_export(id.name.as_str(), id.expect_symbol_id(), id.span);
782+
self.add_local_export(id.name.as_str(), id.symbol_id(), id.span);
783783
}
784784
_ => {
785785
self.untranspiled_syntax |= UntranspiledSyntax::TypeScript;
@@ -838,14 +838,14 @@ impl<'me, 'ast: 'me> AstScanner<'me, 'ast> {
838838
.insert(SymbolRefFlags::SideEffectsFreeFunction);
839839
}
840840
fn_decl.id.as_ref().map(|id| {
841-
let symbol_id = rolldown_ecmascript_utils::BindingIdentifierExt::expect_symbol_id(id);
841+
let symbol_id = id.symbol_id();
842842
self.result.default_export_ref.symbol = symbol_id;
843843
(symbol_id, id.span)
844844
})
845845
}
846846
ast::ExportDefaultDeclarationKind::ClassDeclaration(cls_decl) => {
847847
cls_decl.id.as_ref().map(|id| {
848-
let symbol_id = rolldown_ecmascript_utils::BindingIdentifierExt::expect_symbol_id(id);
848+
let symbol_id = id.symbol_id();
849849
self.result.default_export_ref.symbol = symbol_id;
850850
(symbol_id, id.span)
851851
})
@@ -891,15 +891,15 @@ impl<'me, 'ast: 'me> AstScanner<'me, 'ast> {
891891
let Some(specifiers) = &decl.specifiers else { return };
892892
specifiers.iter().for_each(|spec| match spec {
893893
ast::ImportDeclarationSpecifier::ImportSpecifier(spec) => {
894-
let sym = spec.local.expect_symbol_id();
894+
let sym = spec.local.symbol_id();
895895
let imported = spec.imported.name();
896896
self.add_named_import(sym, imported.as_str(), rec_id, spec.imported.span());
897897
}
898898
ast::ImportDeclarationSpecifier::ImportDefaultSpecifier(spec) => {
899-
self.add_named_import(spec.local.expect_symbol_id(), "default", rec_id, spec.span);
899+
self.add_named_import(spec.local.symbol_id(), "default", rec_id, spec.span);
900900
}
901901
ast::ImportDeclarationSpecifier::ImportNamespaceSpecifier(spec) => {
902-
let symbol_id = spec.local.expect_symbol_id();
902+
let symbol_id = spec.local.symbol_id();
903903
self.add_star_import(symbol_id, rec_id, spec.local.span());
904904
}
905905
});

‎crates/rolldown/src/hmr/hmr_ast_finalizer.rs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use rolldown_common::{
1212
ExternalModule, ImportRecordIdx, IndexModules, Module, ModuleIdx, NormalModule,
1313
};
1414
use rolldown_ecmascript::CJS_REQUIRE_REF_ATOM;
15-
use rolldown_ecmascript_utils::{AstSnippet, BindingIdentifierExt, ExpressionExt};
15+
use rolldown_ecmascript_utils::{AstSnippet, ExpressionExt};
1616
use rolldown_utils::{
1717
ecmascript::is_validate_identifier_name,
1818
indexmap::{FxIndexMap, FxIndexSet},
@@ -96,25 +96,24 @@ impl<'ast> HmrAstFinalizer<'_, 'ast> {
9696
specifiers.iter().for_each(|spec| match spec {
9797
ast::ImportDeclarationSpecifier::ImportSpecifier(import_specifier) => {
9898
self.import_bindings.insert(
99-
import_specifier.local.expect_symbol_id(),
99+
import_specifier.local.symbol_id(),
100100
format!("{binding_name}.{}", import_specifier.imported.name()),
101101
);
102102
}
103103
ast::ImportDeclarationSpecifier::ImportDefaultSpecifier(
104104
import_default_specifier,
105105
) => {
106106
self.import_bindings.insert(
107-
import_default_specifier.local.expect_symbol_id(),
107+
import_default_specifier.local.symbol_id(),
108108
format!("{binding_name}.default"),
109109
);
110110
}
111111
ast::ImportDeclarationSpecifier::ImportNamespaceSpecifier(
112112
import_namespace_specifier,
113113
) => {
114-
self.import_bindings.insert(
115-
import_namespace_specifier.local.expect_symbol_id(),
116-
binding_name.clone(),
117-
);
114+
self
115+
.import_bindings
116+
.insert(import_namespace_specifier.local.symbol_id(), binding_name.clone());
118117
}
119118
});
120119
});

‎crates/rolldown/src/stages/link_stage/cross_module_optimization.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use oxc::{
33
ast::{
44
AstBuilder, AstKind,
55
ast::{
6-
BindingPattern, Declaration, ExportDefaultDeclaration, ExportDefaultDeclarationKind,
7-
ExportNamedDeclaration,
6+
BindingIdentifier, BindingPattern, Declaration, ExportDefaultDeclaration,
7+
ExportDefaultDeclarationKind, ExportNamedDeclaration,
88
},
99
},
1010
ast_visit::{Visit, walk},
@@ -485,10 +485,10 @@ impl<'a, 'ast: 'a> Visit<'ast> for CrossModuleOptimizationRunnerContext<'a, 'ast
485485
let local_binding_for_default_export = match &it.declaration {
486486
oxc::ast::match_expression!(ExportDefaultDeclarationKind) => None,
487487
ExportDefaultDeclarationKind::FunctionDeclaration(fn_decl) => {
488-
fn_decl.id.as_ref().map(rolldown_ecmascript_utils::BindingIdentifierExt::expect_symbol_id)
488+
fn_decl.id.as_ref().map(BindingIdentifier::symbol_id)
489489
}
490490
ExportDefaultDeclarationKind::ClassDeclaration(cls_decl) => {
491-
cls_decl.id.as_ref().map(rolldown_ecmascript_utils::BindingIdentifierExt::expect_symbol_id)
491+
cls_decl.id.as_ref().map(BindingIdentifier::symbol_id)
492492
}
493493
ExportDefaultDeclarationKind::TSInterfaceDeclaration(_) => unreachable!(),
494494
};

‎crates/rolldown_ecmascript_utils/src/extensions/ast_ext/binding_identifier_ext.rs‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎crates/rolldown_ecmascript_utils/src/extensions/ast_ext/mod.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
mod binding_property_ext;
22

3-
pub mod binding_identifier_ext;
43
pub mod binding_pattern_ext;
54
pub mod call_expression_ext;
65
pub mod expression_ext;

‎crates/rolldown_ecmascript_utils/src/lib.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ mod source_utils;
66
pub use crate::{
77
ast_snippet::AstSnippet,
88
extensions::ast_ext::{
9-
binding_identifier_ext::BindingIdentifierExt, binding_pattern_ext::BindingPatternExt,
10-
call_expression_ext::CallExpressionExt, expression_ext::ExpressionExt, function::FunctionExt,
11-
jsx::JsxExt, statement_ext::StatementExt,
9+
binding_pattern_ext::BindingPatternExt, call_expression_ext::CallExpressionExt,
10+
expression_ext::ExpressionExt, function::FunctionExt, jsx::JsxExt, statement_ext::StatementExt,
1211
},
1312
scope::is_top_level,
1413
source_utils::contains_script_closing_tag,

0 commit comments

Comments
 (0)