Skip to content

Commit

Permalink
Revert "perf: Use custom allocator (#2768)" (#2841)
Browse files Browse the repository at this point in the history
This is causing wheel creation to fail on some of our more exotic build targets: https:/charliermarsh/ruff/actions/runs/4159524132.

Let's figure out how to gate appropriately, but for now, reverting to get the release out.
  • Loading branch information
charliermarsh authored Feb 13, 2023
1 parent 63f3d5e commit 48a5cd1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 59 deletions.
50 changes: 5 additions & 45 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions crates/ruff_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,3 @@ ureq = { version = "2.5.0", features = [] }

[package.metadata.maturin]
name = "ruff"

[target.'cfg(windows)'.dependencies]
mimalloc = "0.1.29"

[target.'cfg(not(windows))'.dependencies]
tikv-jemallocator = "0.5.0"
8 changes: 0 additions & 8 deletions crates/ruff_cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@ mod iterators;
mod printer;
mod resolve;

#[cfg(target_os = "windows")]
#[global_allocator]
static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;

#[cfg(not(target_os = "windows"))]
#[global_allocator]
static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;

enum ExitStatus {
/// Linting was successful and there were no linting errors.
Success,
Expand Down

0 comments on commit 48a5cd1

Please sign in to comment.