From d8a9b450a6b5190effbe606dc8c49af726f93000 Mon Sep 17 00:00:00 2001
From: John Renner <john@jrenner.net>
Date: Fri, 7 May 2021 12:17:37 -0700
Subject: Switch from jemalloc to tikv-jemalloc

---
 crates/profile/Cargo.toml       | 4 ++--
 crates/rust-analyzer/Cargo.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'crates')

diff --git a/crates/profile/Cargo.toml b/crates/profile/Cargo.toml
index 486f9c164..98df79a8f 100644
--- a/crates/profile/Cargo.toml
+++ b/crates/profile/Cargo.toml
@@ -15,14 +15,14 @@ cfg-if = "1"
 libc = "0.2.73"
 la-arena = { version = "0.2.0", path = "../../lib/arena" }
 countme = { version = "2.0.1", features = ["enable"] }
-jemalloc-ctl = { version = "0.3.3", optional = true }
+tikv-jemalloc-ctl = { version = "0.4.1", optional = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 perf-event = "0.4"
 
 [features]
 cpu_profiler = []
-jemalloc = ["jemalloc-ctl"]
+jemalloc = ["tikv-jemalloc-ctl"]
 
 # Uncomment to enable for the whole crate graph
 # default = [ "cpu_profiler" ]
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 3e8f4bf89..4b40e41ac 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -63,7 +63,7 @@ proc_macro_srv = { path = "../proc_macro_srv", version = "0.0.0" }
 winapi = "0.3.8"
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
-jemallocator = { version = "0.3.2", optional = true }
+tikv-jemallocator = { version = "0.4.1", optional = true }
 
 [dev-dependencies]
 expect-test = "1.1"
@@ -72,5 +72,5 @@ mbe = { path = "../mbe" }
 tt = { path = "../tt" }
 
 [features]
-jemalloc = ["jemallocator", "profile/jemalloc"]
+jemalloc = ["tikv-jemallocator", "profile/jemalloc"]
 force-always-assert = ["always-assert/force"]
-- 
cgit v1.2.3


From 4059112b4e6fbe6fd1b9c6640c031a2c346f6225 Mon Sep 17 00:00:00 2001
From: John Renner <john@jrenner.net>
Date: Fri, 7 May 2021 12:41:07 -0700
Subject: Use package renaming so source doesn't say tikv

---
 crates/profile/Cargo.toml       | 4 ++--
 crates/rust-analyzer/Cargo.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'crates')

diff --git a/crates/profile/Cargo.toml b/crates/profile/Cargo.toml
index 98df79a8f..1a8c8f862 100644
--- a/crates/profile/Cargo.toml
+++ b/crates/profile/Cargo.toml
@@ -15,14 +15,14 @@ cfg-if = "1"
 libc = "0.2.73"
 la-arena = { version = "0.2.0", path = "../../lib/arena" }
 countme = { version = "2.0.1", features = ["enable"] }
-tikv-jemalloc-ctl = { version = "0.4.1", optional = true }
+jemalloc-ctl = { version = "0.4.1", package = "tikv-jemalloc-ctl", optional = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 perf-event = "0.4"
 
 [features]
 cpu_profiler = []
-jemalloc = ["tikv-jemalloc-ctl"]
+jemalloc = ["jemalloc-ctl"]
 
 # Uncomment to enable for the whole crate graph
 # default = [ "cpu_profiler" ]
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 4b40e41ac..3010815df 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -63,7 +63,7 @@ proc_macro_srv = { path = "../proc_macro_srv", version = "0.0.0" }
 winapi = "0.3.8"
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
-tikv-jemallocator = { version = "0.4.1", optional = true }
+jemallocator = { version = "0.4.1", package = "tikv-jemallocator", optional = true }
 
 [dev-dependencies]
 expect-test = "1.1"
@@ -72,5 +72,5 @@ mbe = { path = "../mbe" }
 tt = { path = "../tt" }
 
 [features]
-jemalloc = ["tikv-jemallocator", "profile/jemalloc"]
+jemalloc = ["jemallocator", "profile/jemalloc"]
 force-always-assert = ["always-assert/force"]
-- 
cgit v1.2.3