Merge pull request #1722 from musicinmybrain/tikv

Depend on jemallocator as tikv-jemallocator, and update it to 0.6

Author: tmccombs

Cargo.lock

@@ -70,7 +70,7 @@ libc = "0.2"
 # jemalloc is currently disabled on macOS due to a bug in jemalloc in combination with macOS
 # Catalina. See https://github.com/sharkdp/fd/issues/498 for details.
 [target.'cfg(all(not(windows), not(target_os = "android"), not(target_os = "macos"), not(target_os = "freebsd"), not(target_os = "openbsd"), not(all(target_env = "musl", target_pointer_width = "32")), not(target_arch = "riscv64")))'.dependencies]
-jemallocator = {version = "0.5.4", optional = true}
+tikv-jemallocator = {version = "0.6.0", optional = true}
 
 [dev-dependencies]
 diff = "0.1"
@@ -84,7 +84,7 @@ strip = true
 codegen-units = 1
 
 [features]
-use-jemalloc = ["jemallocator"]
+use-jemalloc = ["tikv-jemallocator"]
 completions = ["clap_complete"]
 base = ["use-jemalloc"]
 default = ["use-jemalloc", "completions"]

Cargo.toml

@@ -47,7 +47,7 @@ use crate::regex_helper::{pattern_has_uppercase_char, pattern_matches_strings_wi
     feature = "use-jemalloc"
 ))]
 #[global_allocator]
-static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
+static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 
 // vivid --color-mode 8-bit generate molokai
 const DEFAULT_LS_COLORS: &str = "