From ce920bd079510dffd6fa843443027d308139baeb Mon Sep 17 00:00:00 2001
From: Jose Quintana <joseluisquintana20@gmail.com>
Date: Sat, 23 Apr 2022 07:24:00 +0200
Subject: [PATCH] refactor: move to maintained jemalloc (`tikv-jemallocator`)

---
 Cargo.lock        | 44 ++++++++++++++++++++++----------------------
 Cargo.toml        |  4 ++--
 src/bin/server.rs |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f8594cc..fbf2442 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -308,27 +308,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "jemalloc-sys"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d3b9f3f5c9b31aa0f5ed3260385ac205db665baa41d49bb8338008ae94ede45"
-dependencies = [
- "cc",
- "fs_extra",
- "libc",
-]
-
-[[package]]
-name = "jemallocator"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43ae63fcfc45e99ab3d1b29a46782ad679e98436c3169d15a167a1108a724b69"
-dependencies = [
- "jemalloc-sys",
- "libc",
-]
-
-[[package]]
 name = "language-tags"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -847,7 +826,6 @@ dependencies = [
  "iron",
  "iron-cors",
  "iron-test",
- "jemallocator",
  "log 0.4.16",
  "mime",
  "mime_guess",
@@ -855,6 +833,7 @@ dependencies = [
  "percent-encoding 2.1.0",
  "structopt",
  "tempfile",
+ "tikv-jemallocator",
  "time",
  "url",
 ]
@@ -918,6 +897,27 @@ dependencies = [
 ]
 
 [[package]]
+name = "tikv-jemalloc-sys"
+version = "0.4.3+5.2.1-patched.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1792ccb507d955b46af42c123ea8863668fae24d03721e40cad6a41773dbb49"
+dependencies = [
+ "cc",
+ "fs_extra",
+ "libc",
+]
+
+[[package]]
+name = "tikv-jemallocator"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5b7bcecfafe4998587d636f9ae9d55eb9d0499877b88757767c346875067098"
+dependencies = [
+ "libc",
+ "tikv-jemalloc-sys",
+]
+
+[[package]]
 name = "time"
 version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index df1492d..8539eb7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,8 +41,8 @@ url = "1.4"
 percent-encoding = "2.1"
 ctrlc = { version = "3.1", features = ["termination"] }
 
-[target.'cfg(all(target_env = "musl", target_pointer_width = "64"))'.dependencies.jemallocator]
-version = "0.3"
+[target.'cfg(all(target_env = "musl", target_pointer_width = "64"))'.dependencies.tikv-jemallocator]
+version = "0.4"
 
 [dev-dependencies]
 openssl = { version = "0.10", features = ["vendored"] }
diff --git a/src/bin/server.rs b/src/bin/server.rs
index b57fd23..1073eb9 100644
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -3,7 +3,7 @@
 
 #[cfg(all(target_env = "musl", target_pointer_width = "64"))]
 #[global_allocator]
-static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
+static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 
 use static_web_server::{server, Options};
 use structopt::StructOpt;
--
libgit2 1.7.2