Skip to content

refactor(linter): remove ModuleContentOwner abstraction #12331

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
merged 1 commit into from
Jul 16, 2025
Merged

refactor(linter): remove ModuleContentOwner abstraction #12331

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
13 changes: 4 additions & 9 deletions crates/oxc_linter/src/service/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ struct ResolvedModuleRecord {

self_cell! {
struct ModuleContent<'alloc_pool> {
owner: ModuleContentOwner<'alloc_pool>,
owner: AllocatorGuard<'alloc_pool>,
#[not_covariant]
dependent: ModuleContentDependent,
}
Expand All @@ -101,10 +101,6 @@ struct ModuleContentDependent<'a> {
// Safety: dependent borrows from owner. They're safe to be sent together.
unsafe impl Send for ModuleContent<'_> {}

struct ModuleContentOwner<'alloc_pool> {
allocator: AllocatorGuard<'alloc_pool>,
}

/// source text and semantic for each source section. They are in the same order as `ProcessedModule.section_module_records`
type SectionContents<'a> = SmallVec<[SectionContent<'a>; 1]>;
struct SectionContent<'a> {
Expand Down Expand Up @@ -812,9 +808,8 @@ impl Runtime {
if self.paths.contains(path) {
let allocator = self.allocator_pool.get();

let build = ModuleContent::try_new(ModuleContentOwner { allocator }, |owner| {
let Some(stt) =
self.get_source_type_and_text(Path::new(path), ext, &owner.allocator)
let build = ModuleContent::try_new(allocator, |allocator| {
let Some(stt) = self.get_source_type_and_text(Path::new(path), ext, allocator)
else {
return Err(());
};
Expand All @@ -834,7 +829,7 @@ impl Runtime {
check_syntax_errors,
source_type,
source_text,
&owner.allocator,
allocator,
Some(&mut section_contents),
);

Expand Down
Loading