dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-19 12:19:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(linter): fix oxlint allocator cfg (#4527)

Browse source 
Fix 2 mistakes in the `#[cfg]` for custom allocators in `oxlint` CLI.

1. `#![cfg(not(miri))]` at top of file was disabling the entire module if running miri, rather than just disabling custom allocator.
2. If both `target_os = "windows"` and `not(target_env = "msvc")`, it would try to register both mimalloc and jemalloc as global allocator.

I am actually not sure if it's possible to compile for Windows without using MSVC, but it seems like a good idea not to assume.
This commit is contained in:
overlookmotel 2024-07-30 10:47:15 +00:00
parent d5c4b190aa
commit 732f4e2591
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/oxlint/Cargo.toml
View file

@ -24,7 +24,7 @@ path = "src/main.rs"
test = false
doctest = false
[target.'cfg(not(target_env = "msvc"))'.dependencies]
[target.'cfg(all(not(target_env = "msvc"), not(target_os = "windows")))'.dependencies]
jemallocator = { workspace = true, optional = true }
[target.'cfg(target_os = "windows")'.dependencies]

9
apps/oxlint/src/main.rs
View file

@ -1,12 +1,9 @@
#![cfg(not(miri))] // Miri does not support custom allocators
#[cfg(feature = "allocator")]
#[cfg(not(target_env = "msvc"))]
// NB: Miri does not support custom allocators
#[cfg(all(feature = "allocator", not(miri), not(target_env = "msvc"), not(target_os = "windows")))]
#[global_allocator]
static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc;
#[cfg(feature = "allocator")]
#[cfg(target_os = "windows")]
#[cfg(all(feature = "allocator", not(miri), target_os = "windows"))]
#[global_allocator]
static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;