From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Sat, 2 Oct 2021 00:08:00 +0000 (+0100)
Subject: d-0005-no-jemalloc
X-Git-Tag: archive/raspbian/1.94.1+dfsg1-1+rpi1~1^2~38
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6d9a02f1c4473dd0968de5ace1eef66f04c81805;p=rustc.git

d-0005-no-jemalloc

Description: remove jemalloc-sys

Forwarded: not-needed

Gbp-Pq: Topic prune
Gbp-Pq: Name d-0005-no-jemalloc.patch
---

diff --git a/compiler/rustc/Cargo.toml b/compiler/rustc/Cargo.toml
index 8cef9e0644..8e1e936c64 100644
--- a/compiler/rustc/Cargo.toml
+++ b/compiler/rustc/Cargo.toml
@@ -27,15 +27,9 @@ getrandom = "=0.3.3"
 wasi = "=0.14.2"
 
 
-[dependencies.tikv-jemalloc-sys]
-version = "0.6.1"
-optional = true
-features = ['override_allocator_on_supported_platforms']
-
 [features]
 # tidy-alphabetical-start
 check_only = ['rustc_driver_impl/check_only']
-jemalloc = ['dep:tikv-jemalloc-sys']
 llvm = ['rustc_driver_impl/llvm']
 llvm_enzyme = ['rustc_driver_impl/llvm_enzyme']
 llvm_offload = ['rustc_driver_impl/llvm_offload']
diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml
index 4828419003..f60282f270 100644
--- a/src/tools/rust-analyzer/crates/profile/Cargo.toml
+++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml
@@ -14,7 +14,6 @@ doctest = false
 
 [dependencies]
 cfg-if = "1.0.1"
-jemalloc-ctl = { version = "0.5.4", package = "tikv-jemalloc-ctl", optional = true }
 
 [target.'cfg(all(target_os = "linux", not(target_env = "ohos")))'.dependencies]
 perf-event = "=0.4.7"
@@ -30,7 +29,6 @@ windows-sys = { version = "0.60", features = [
 
 [features]
 cpu_profiler = []
-jemalloc = ["jemalloc-ctl"]
 
 # Uncomment to enable for the whole crate graph
 # default = [ "cpu_profiler" ]
diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
index d1283ca59e..c0d7f5d77b 100644
--- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
+++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
@@ -83,9 +83,6 @@ windows-sys = { version = "0.60", features = [
   "Win32_System_Threading",
 ] }
 
-[target.'cfg(not(target_env = "msvc"))'.dependencies]
-jemallocator = { version = "0.5.4", package = "tikv-jemallocator", optional = true }
-
 [dev-dependencies]
 expect-test = "1.5.1"
 xshell.workspace = true
@@ -95,7 +92,6 @@ test-fixture.workspace = true
 syntax-bridge.workspace = true
 
 [features]
-jemalloc = ["jemallocator", "profile/jemalloc"]
 force-always-assert = ["stdx/force-always-assert"]
 in-rust-tree = [
   "cfg/in-rust-tree",