about summary refs log tree commit diff
path: root/compiler/rustc
diff options
context:
space:
mode:
authorRémy Rakic <remy.rakic+github@gmail.com>2024-12-02 16:16:41 +0000
committerRémy Rakic <remy.rakic+github@gmail.com>2024-12-03 08:56:33 +0000
commita69fe84ec841c20d229711d6861c5d889851e7f5 (patch)
treeda1c17e448077a171d0a48f179b6f1af1e16a403 /compiler/rustc
parentefdd9e802053caeb52103945df858e87f837e59a (diff)
downloadrust-a69fe84ec841c20d229711d6861c5d889851e7f5.tar.gz
rust-a69fe84ec841c20d229711d6861c5d889851e7f5.zip
switch jemalloc-sys back to tikv-jemalloc-sys, and update to 0.6.0
Diffstat (limited to 'compiler/rustc')
-rw-r--r--compiler/rustc/Cargo.toml6
-rw-r--r--compiler/rustc/src/main.rs2
2 files changed, 5 insertions, 3 deletions
diff --git a/compiler/rustc/Cargo.toml b/compiler/rustc/Cargo.toml
index f85c30ac7ec..d24b630516a 100644
--- a/compiler/rustc/Cargo.toml
+++ b/compiler/rustc/Cargo.toml
@@ -20,14 +20,14 @@ rustc_smir = { path = "../rustc_smir" }
 stable_mir = { path = "../stable_mir" }
 # tidy-alphabetical-end
 
-[dependencies.jemalloc-sys]
-version = "0.5.0"
+[dependencies.tikv-jemalloc-sys]
+version = "0.6.0"
 optional = true
 features = ['unprefixed_malloc_on_supported_platforms']
 
 [features]
 # tidy-alphabetical-start
-jemalloc = ['dep:jemalloc-sys']
+jemalloc = ['dep:tikv-jemalloc-sys']
 llvm = ['rustc_driver_impl/llvm']
 max_level_info = ['rustc_driver_impl/max_level_info']
 rustc_randomized_layouts = ['rustc_driver_impl/rustc_randomized_layouts']
diff --git a/compiler/rustc/src/main.rs b/compiler/rustc/src/main.rs
index ccf88d8ff4b..a55a63a7bf1 100644
--- a/compiler/rustc/src/main.rs
+++ b/compiler/rustc/src/main.rs
@@ -43,6 +43,8 @@ fn main() {
     {
         use std::os::raw::{c_int, c_void};
 
+        use tikv_jemalloc_sys as jemalloc_sys;
+
         #[used]
         static _F1: unsafe extern "C" fn(usize, usize) -> *mut c_void = jemalloc_sys::calloc;
         #[used]