From 6b39374176ff94659eec4c887a77e86e939c25e6 Mon Sep 17 00:00:00 2001 From: overlookmotel Date: Thu, 25 Jul 2024 21:16:51 +0100 Subject: [PATCH] refactor(semantic): methods take `Span` as param, not `&Span` --- crates/oxc_linter/src/rules/import/namespace.rs | 2 +- .../src/rules/import/no_named_as_default_member.rs | 2 +- crates/oxc_semantic/src/symbol.rs | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/oxc_linter/src/rules/import/namespace.rs b/crates/oxc_linter/src/rules/import/namespace.rs index 2d049af078bbc..9209b11b20d44 100644 --- a/crates/oxc_linter/src/rules/import/namespace.rs +++ b/crates/oxc_linter/src/rules/import/namespace.rs @@ -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; }; diff --git a/crates/oxc_linter/src/rules/import/no_named_as_default_member.rs b/crates/oxc_linter/src/rules/import/no_named_as_default_member.rs index 269844bd288c3..57819e2b9ea97 100644 --- a/crates/oxc_linter/src/rules/import/no_named_as_default_member.rs +++ b/crates/oxc_linter/src/rules/import/no_named_as_default_member.rs @@ -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()), ); } diff --git a/crates/oxc_semantic/src/symbol.rs b/crates/oxc_semantic/src/symbol.rs index 1d43ae6551882..eb5cd57885e9b 100644 --- a/crates/oxc_semantic/src/symbol.rs +++ b/crates/oxc_semantic/src/symbol.rs @@ -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 { + pub fn get_symbol_id_from_span(&self, span: Span) -> Option { 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 { @@ -113,7 +113,7 @@ impl SymbolTable { self.scope_ids[symbol_id] } - pub fn get_scope_id_from_span(&self, span: &Span) -> Option { + pub fn get_scope_id_from_span(&self, span: Span) -> Option { self.get_symbol_id_from_span(span).map(|symbol_id| self.get_scope_id(symbol_id)) }