Revert "perf: Use custom allocator (#2768)" (#2841)

This is causing wheel creation to fail on some of our more exotic build targets: 4159524132.

Let's figure out how to gate appropriately, but for now, reverting to get the release out.
This commit is contained in:
Charlie Marsh 2023-02-12 22:31:34 -05:00 committed by GitHub
parent 63f3d5e610
commit 48a5cd1dd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 59 deletions

50
Cargo.lock generated
View file

@ -1539,16 +1539,6 @@ dependencies = [
"syn",
]
[[package]]
name = "libmimalloc-sys"
version = "0.1.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd8c7cbf8b89019683667e347572e6d55a7df7ea36b0c4ce69961b0cde67b174"
dependencies = [
"cc",
"libc",
]
[[package]]
name = "link-cplusplus"
version = "1.0.8"
@ -1655,15 +1645,6 @@ dependencies = [
"autocfg",
]
[[package]]
name = "mimalloc"
version = "0.1.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9dcb174b18635f7561a0c6c9fc2ce57218ac7523cf72c50af80e2d79ab8f3ba1"
dependencies = [
"libmimalloc-sys",
]
[[package]]
name = "mime"
version = "0.3.16"
@ -2516,7 +2497,6 @@ dependencies = [
"itertools",
"log",
"mdcat",
"mimalloc",
"notify",
"path-absolutize",
"pulldown-cmark",
@ -2531,7 +2511,6 @@ dependencies = [
"strum",
"syntect",
"textwrap",
"tikv-jemallocator",
"ureq",
"walkdir",
]
@ -3149,10 +3128,11 @@ dependencies = [
[[package]]
name = "thread_local"
version = "1.1.4"
version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
dependencies = [
"cfg-if",
"once_cell",
]
@ -3176,26 +3156,6 @@ dependencies = [
"weezl",
]
[[package]]
name = "tikv-jemalloc-sys"
version = "0.5.3+5.3.0-patched"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8"
dependencies = [
"cc",
"libc",
]
[[package]]
name = "tikv-jemallocator"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979"
dependencies = [
"libc",
"tikv-jemalloc-sys",
]
[[package]]
name = "time"
version = "0.1.45"
@ -3271,9 +3231,9 @@ dependencies = [
[[package]]
name = "tokio-util"
version = "0.7.6"
version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc6a3b08b64e6dfad376fa2432c7b1f01522e37a623c3050bc95db2d3ff21583"
checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2"
dependencies = [
"bytes",
"futures-core",

View file

@ -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"

View file

@ -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,