refactor(linter): simplify accessing span of NameSpan (#11305)

ulrichstark · web-flow · commit b53b053260bd · 2025-05-27T09:51:14.000+01:00
Make span of NameSpan public like it already is in
oxc_syntax::module_record::NameSpan to make code shorter and more
explicit.

Also found five unnecessary clones while working on this.
diff --git a/crates/oxc_linter/src/module_record.rs b/crates/oxc_linter/src/module_record.rs
@@ -116,7 +116,7 @@ impl fmt::Debug for ModuleRecord {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct NameSpan {
     pub name: CompactStr,
-    span: Span,
+    pub span: Span,
 }
 
 impl NameSpan {
@@ -127,10 +127,6 @@ impl NameSpan {
     pub fn name(&self) -> &str {
         self.name.as_str()
     }
-
-    pub fn span(&self) -> Span {
-        self.span
-    }
 }
 
 impl<'a> From<&oxc_syntax::module_record::NameSpan<'a>> for NameSpan {
@@ -392,7 +388,7 @@ impl ExportExportName {
     /// Attempt to get the [`Span`] of this export name.
     pub fn span(&self) -> Option<Span> {
         match self {
-            Self::Name(name) => Some(name.span()),
+            Self::Name(name) => Some(name.span),
             Self::Default(span) => Some(*span),
             Self::Null => None,
         }
diff --git a/crates/oxc_linter/src/rules/eslint/no_duplicate_imports.rs b/crates/oxc_linter/src/rules/eslint/no_duplicate_imports.rs
@@ -137,7 +137,7 @@ impl Rule for NoDuplicateImports {
 
         for entry in &module_record.import_entries {
             let source = &entry.module_request.name;
-            let span = entry.module_request.span();
+            let span = entry.module_request.span;
 
             let same_statement = if let Some(curr_span) = current_span {
                 curr_span == span
diff --git a/crates/oxc_linter/src/rules/eslint/no_restricted_imports.rs b/crates/oxc_linter/src/rules/eslint/no_restricted_imports.rs
@@ -1295,14 +1295,14 @@ fn get_diagnostic_from_import_name_result_path(
         },
         ImportNameResult::NameDisallowed(name_span) => match &path.allow_import_names {
             Some(allow_import_names) => diagnostic_allowed_import_name(
-                name_span.clone().span(),
+                name_span.span,
                 path.message.clone(),
                 name_span.name(),
                 source,
                 allow_import_names.join(", ").as_str(),
             ),
             _ => diagnostic_import_name(
-                name_span.clone().span(),
+                name_span.span,
                 path.message.clone(),
                 name_span.name(),
                 source,
@@ -1363,22 +1363,22 @@ fn get_diagnostic_from_import_name_result_pattern(
         }
         ImportNameResult::NameDisallowed(name_span) => match &pattern.allow_import_names {
             Some(allow_import_names) => diagnostic_allowed_import_name(
-                name_span.clone().span(),
+                name_span.span,
                 pattern.message.clone(),
                 name_span.name(),
                 source,
                 allow_import_names.join(", ").as_str(),
             ),
             _ => match &pattern.allow_import_name_pattern {
                 Some(allow_import_name_pattern) => diagnostic_allowed_import_name_pattern(
-                    name_span.clone().span(),
+                    name_span.span,
                     pattern.message.clone(),
                     name_span.name(),
                     source,
                     allow_import_name_pattern.as_str(),
                 ),
                 _ => diagnostic_pattern_and_import_name(
-                    name_span.clone().span(),
+                    name_span.span,
                     pattern.message.clone(),
                     name_span.name(),
                     source,
diff --git a/crates/oxc_linter/src/rules/import/export.rs b/crates/oxc_linter/src/rules/import/export.rs
@@ -74,7 +74,7 @@ impl Rule for Export {
             walk_exported_recursive(remote_module_record, &mut export_names, &mut visited);
 
             if export_names.is_empty() {
-                ctx.diagnostic(no_named_export(module_request.name(), module_request.span()));
+                ctx.diagnostic(no_named_export(module_request.name(), module_request.span));
             } else {
                 all_export_names.insert(star_export_entry.span, export_names);
             }
diff --git a/crates/oxc_linter/src/rules/import/max_dependencies.rs b/crates/oxc_linter/src/rules/import/max_dependencies.rs
@@ -119,7 +119,7 @@ impl Rule for MaxDependencies {
             "File has too many dependencies ({}). Maximum allowed is {}.",
             module_count, self.max,
         );
-        ctx.diagnostic(max_dependencies_diagnostic(error, entry.module_request.span()));
+        ctx.diagnostic(max_dependencies_diagnostic(error, entry.module_request.span));
     }
 }
 
diff --git a/crates/oxc_linter/src/rules/import/named.rs b/crates/oxc_linter/src/rules/import/named.rs
@@ -105,7 +105,7 @@ impl Rule for Named {
             if !remote_module_record.has_module_syntax {
                 continue;
             }
-            let import_span = import_name.span();
+            let import_span = import_name.span;
             let name = import_name.name();
             // Check `import { default as foo } from 'bar'`
             if name == "default" && remote_module_record.export_default.is_some() {
@@ -152,7 +152,7 @@ impl Rule for Named {
             if remote_module_record.exported_bindings.contains_key(name) {
                 continue;
             }
-            ctx.diagnostic(named_diagnostic(name, specifier, import_name.span()));
+            ctx.diagnostic(named_diagnostic(name, specifier, import_name.span));
         }
     }
 }
diff --git a/crates/oxc_linter/src/rules/import/no_duplicates.rs b/crates/oxc_linter/src/rules/import/no_duplicates.rs
@@ -118,7 +118,7 @@ impl Rule for NoDuplicates {
                 let imports = module_record
                     .import_entries
                     .iter()
-                    .filter(|entry| entry.module_request.span() == requested_module.span)
+                    .filter(|entry| entry.module_request.span == requested_module.span)
                     .collect::<Vec<_>>();
                 if imports.is_empty() {
                     import_entries_maps.entry(0).or_default().push(requested_module);
diff --git a/crates/oxc_linter/src/rules/import/no_named_default.rs b/crates/oxc_linter/src/rules/import/no_named_default.rs
@@ -48,7 +48,7 @@ impl Rule for NoNamedDefault {
                 return;
             };
             if import_name.name() == "default" && !entry.is_type {
-                ctx.diagnostic(no_named_default_diagnostic(import_name.span()));
+                ctx.diagnostic(no_named_default_diagnostic(import_name.span));
             }
         });
     }
diff --git a/crates/oxc_linter/src/rules/import/no_namespace.rs b/crates/oxc_linter/src/rules/import/no_namespace.rs
@@ -108,7 +108,7 @@ impl Rule for NoNamespace {
                 let source = entry.module_request.name();
 
                 if self.ignore.is_empty() {
-                    ctx.diagnostic(no_namespace_diagnostic(entry.local_name.span()));
+                    ctx.diagnostic(no_namespace_diagnostic(entry.local_name.span));
                 } else {
                     if !source.contains('.') {
                         return;
@@ -120,7 +120,7 @@ impl Rule for NoNamespace {
                         return;
                     }
 
-                    ctx.diagnostic(no_namespace_diagnostic(entry.local_name.span()));
+                    ctx.diagnostic(no_namespace_diagnostic(entry.local_name.span));
                 }
             }
             ImportImportName::Name(_) | ImportImportName::Default(_) => {}
diff --git a/crates/oxc_linter/src/rules/jest/no_mocks_import.rs b/crates/oxc_linter/src/rules/jest/no_mocks_import.rs
@@ -51,7 +51,7 @@ impl Rule for NoMocksImport {
         for import_entry in &module_records.import_entries {
             let module_specifier = import_entry.module_request.name();
             if contains_mocks_dir(module_specifier) {
-                ctx.diagnostic(no_mocks_import_diagnostic(import_entry.module_request.span()));
+                ctx.diagnostic(no_mocks_import_diagnostic(import_entry.module_request.span));
             }
         }
 
diff --git a/crates/oxc_linter/src/rules/oxc/no_barrel_file.rs b/crates/oxc_linter/src/rules/oxc/no_barrel_file.rs
@@ -101,7 +101,7 @@ impl Rule for NoBarrelFile {
             {
                 if let Some(count) = count_loaded_modules(remote_module) {
                     total += count;
-                    labels.push(module_request.span().label(format!("{count} modules")));
+                    labels.push(module_request.span.label(format!("{count} modules")));
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ impl Rule for Export {`
`74`	`74`	`walk_exported_recursive(remote_module_record, &mut export_names, &mut visited);`
`75`	`75`
`76`	`76`	`if export_names.is_empty() {`
`77`		`- ctx.diagnostic(no_named_export(module_request.name(), module_request.span()));`
	`77`	`+ ctx.diagnostic(no_named_export(module_request.name(), module_request.span));`
`78`	`78`	`} else {`
`79`	`79`	`all_export_names.insert(star_export_entry.span, export_names);`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ impl Rule for MaxDependencies {`
`119`	`119`	`"File has too many dependencies ({}). Maximum allowed is {}.",`
`120`	`120`	`module_count, self.max,`
`121`	`121`	`);`
`122`		`- ctx.diagnostic(max_dependencies_diagnostic(error, entry.module_request.span()));`
	`122`	`+ ctx.diagnostic(max_dependencies_diagnostic(error, entry.module_request.span));`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ impl Rule for Named {`
`105`	`105`	`if !remote_module_record.has_module_syntax {`
`106`	`106`	`continue;`
`107`	`107`	`}`
`108`		`- let import_span = import_name.span();`
	`108`	`+ let import_span = import_name.span;`
`109`	`109`	`let name = import_name.name();`
`110`	`110`	// Check `import { default as foo } from 'bar'`
`111`	`111`	`if name == "default" && remote_module_record.export_default.is_some() {`
`@@ -152,7 +152,7 @@ impl Rule for Named {`
`152`	`152`	`if remote_module_record.exported_bindings.contains_key(name) {`
`153`	`153`	`continue;`
`154`	`154`	`}`
`155`		`- ctx.diagnostic(named_diagnostic(name, specifier, import_name.span()));`
	`155`	`+ ctx.diagnostic(named_diagnostic(name, specifier, import_name.span));`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ impl Rule for NoNamedDefault {`
`48`	`48`	`return;`
`49`	`49`	`};`
`50`	`50`	`if import_name.name() == "default" && !entry.is_type {`
`51`		`- ctx.diagnostic(no_named_default_diagnostic(import_name.span()));`
	`51`	`+ ctx.diagnostic(no_named_default_diagnostic(import_name.span));`
`52`	`52`	`}`
`53`	`53`	`});`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ impl Rule for NoNamespace {`
`108`	`108`	`let source = entry.module_request.name();`
`109`	`109`
`110`	`110`	`if self.ignore.is_empty() {`
`111`		`- ctx.diagnostic(no_namespace_diagnostic(entry.local_name.span()));`
	`111`	`+ ctx.diagnostic(no_namespace_diagnostic(entry.local_name.span));`
`112`	`112`	`} else {`
`113`	`113`	`if !source.contains('.') {`
`114`	`114`	`return;`
`@@ -120,7 +120,7 @@ impl Rule for NoNamespace {`
`120`	`120`	`return;`
`121`	`121`	`}`
`122`	`122`
`123`		`- ctx.diagnostic(no_namespace_diagnostic(entry.local_name.span()));`
	`123`	`+ ctx.diagnostic(no_namespace_diagnostic(entry.local_name.span));`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`	`ImportImportName::Name(_) \| ImportImportName::Default(_) => {}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ impl Rule for NoMocksImport {`
`51`	`51`	`for import_entry in &module_records.import_entries {`
`52`	`52`	`let module_specifier = import_entry.module_request.name();`
`53`	`53`	`if contains_mocks_dir(module_specifier) {`
`54`		`- ctx.diagnostic(no_mocks_import_diagnostic(import_entry.module_request.span()));`
	`54`	`+ ctx.diagnostic(no_mocks_import_diagnostic(import_entry.module_request.span));`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`