diff options
| author | bors <bors@rust-lang.org> | 2022-05-27 18:28:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-27 18:28:12 +0000 |
| commit | ebbcbfc236ced21d5e6a92269edb704692ff26b8 (patch) | |
| tree | cb5d8bb6964d8d71b778e1ec1b66010612d3c534 /compiler | |
| parent | 56fd680cf9226ab424f88d4e3b43c5e088d17f19 (diff) | |
| parent | adab1350e76dea8a8af4d062fcad518980673643 (diff) | |
| download | rust-ebbcbfc236ced21d5e6a92269edb704692ff26b8.tar.gz rust-ebbcbfc236ced21d5e6a92269edb704692ff26b8.zip | |
Auto merge of #96790 - lqd:update_jemalloc, r=Mark-Simulacrum
Update jemalloc to v5.3 Now that `jemalloc` version 5.3 has been released, this PR updates `tikv-jemalloc-sys` to the corresponding release. The crates.io publishing issue seems to have been resolved for the `jemalloc-sys` package, and version 5.3.0 is now also available under the historical name (and should become the preferred crate to be used). Therefore, this PR also switches back to using `jemalloc-sys` instead of `tikv-jemalloc-sys`.
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc/Cargo.toml | 6 | ||||
| -rw-r--r-- | compiler/rustc/src/main.rs | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/compiler/rustc/Cargo.toml b/compiler/rustc/Cargo.toml index b642e891956..5e0bb1a7f95 100644 --- a/compiler/rustc/Cargo.toml +++ b/compiler/rustc/Cargo.toml @@ -10,13 +10,13 @@ rustc_driver = { path = "../rustc_driver" } # crate is intended to be used by codegen backends, which may not be in-tree. rustc_codegen_ssa = { path = "../rustc_codegen_ssa" } -[dependencies.tikv-jemalloc-sys] -version = '0.4.0' +[dependencies.jemalloc-sys] +version = "0.5.0" optional = true features = ['unprefixed_malloc_on_supported_platforms'] [features] -jemalloc = ['tikv-jemalloc-sys'] +jemalloc = ['jemalloc-sys'] llvm = ['rustc_driver/llvm'] max_level_info = ['rustc_driver/max_level_info'] rustc_use_parallel_compiler = ['rustc_driver/rustc_use_parallel_compiler'] diff --git a/compiler/rustc/src/main.rs b/compiler/rustc/src/main.rs index 4edd095af10..0de1a781913 100644 --- a/compiler/rustc/src/main.rs +++ b/compiler/rustc/src/main.rs @@ -22,12 +22,10 @@ // The two crates we link to here, `std` and `rustc_driver`, are both dynamic // libraries. So we must reference jemalloc symbols one way or another, because // this file is the only object code in the rustc executable. -#[cfg(feature = "tikv-jemalloc-sys")] -use tikv_jemalloc_sys as jemalloc_sys; fn main() { // See the comment at the top of this file for an explanation of this. - #[cfg(feature = "tikv-jemalloc-sys")] + #[cfg(feature = "jemalloc-sys")] { use std::os::raw::{c_int, c_void}; |
