Skip to content

refactor(semantic): methods take Span as param, not &Span #4470

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
Jul 26, 2024
Merged

refactor(semantic): methods take Span as param, not &Span #4470

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion crates/oxc_linter/src/rules/import/namespace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ impl Rule for Namespace {
}

let Some(symbol_id) =
ctx.semantic().symbols().get_symbol_id_from_span(&entry.local_name.span())
ctx.semantic().symbols().get_symbol_id_from_span(entry.local_name.span())
else {
return;
};
Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_linter/src/rules/import/no_named_as_default_member.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ impl Rule for NoNamedAsDefaultMember {

if !remote_module_record_ref.exported_bindings.is_empty() {
has_members_map.insert(
ctx.symbols().get_symbol_id_from_span(&import_entry.local_name.span()).unwrap(),
ctx.symbols().get_symbol_id_from_span(import_entry.local_name.span()).unwrap(),
(remote_module_record_ref, import_entry.module_request.name().clone()),
);
}
Expand Down
6 changes: 3 additions & 3 deletions crates/oxc_semantic/src/symbol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ impl SymbolTable {
self.spans.iter_enumerated().rev().map(|(symbol_id, _)| symbol_id)
}

pub fn get_symbol_id_from_span(&self, span: &Span) -> Option<SymbolId> {
pub fn get_symbol_id_from_span(&self, span: Span) -> Option<SymbolId> {
self.spans
.iter_enumerated()
.find_map(|(symbol, inner_span)| if inner_span == span { Some(symbol) } else { None })
.find_map(|(symbol, &inner_span)| if inner_span == span { Some(symbol) } else { None })
}

pub fn get_symbol_id_from_name(&self, name: &str) -> Option<SymbolId> {
Expand Down Expand Up @@ -113,7 +113,7 @@ impl SymbolTable {
self.scope_ids[symbol_id]
}

pub fn get_scope_id_from_span(&self, span: &Span) -> Option<ScopeId> {
pub fn get_scope_id_from_span(&self, span: Span) -> Option<ScopeId> {
self.get_symbol_id_from_span(span).map(|symbol_id| self.get_scope_id(symbol_id))
}

Expand Down