aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorJohn Renner <[email protected]>2021-05-07 20:17:37 +0100
committerJohn Renner <[email protected]>2021-05-07 20:17:37 +0100
commitd8a9b450a6b5190effbe606dc8c49af726f93000 (patch)
treecad73531eeed3bedbf940447a5896bc23f88963a /crates
parent1ec82d4bdf47fa5ec1f8599757bbadae274d4f5a (diff)
Switch from jemalloc to tikv-jemalloc
Diffstat (limited to 'crates')
-rw-r--r--crates/profile/Cargo.toml4
-rw-r--r--crates/rust-analyzer/Cargo.toml4
2 files changed, 4 insertions, 4 deletions
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"
15libc = "0.2.73" 15libc = "0.2.73"
16la-arena = { version = "0.2.0", path = "../../lib/arena" } 16la-arena = { version = "0.2.0", path = "../../lib/arena" }
17countme = { version = "2.0.1", features = ["enable"] } 17countme = { version = "2.0.1", features = ["enable"] }
18jemalloc-ctl = { version = "0.3.3", optional = true } 18tikv-jemalloc-ctl = { version = "0.4.1", optional = true }
19 19
20[target.'cfg(target_os = "linux")'.dependencies] 20[target.'cfg(target_os = "linux")'.dependencies]
21perf-event = "0.4" 21perf-event = "0.4"
22 22
23[features] 23[features]
24cpu_profiler = [] 24cpu_profiler = []
25jemalloc = ["jemalloc-ctl"] 25jemalloc = ["tikv-jemalloc-ctl"]
26 26
27# Uncomment to enable for the whole crate graph 27# Uncomment to enable for the whole crate graph
28# default = [ "cpu_profiler" ] 28# 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" }
63winapi = "0.3.8" 63winapi = "0.3.8"
64 64
65[target.'cfg(not(target_env = "msvc"))'.dependencies] 65[target.'cfg(not(target_env = "msvc"))'.dependencies]
66jemallocator = { version = "0.3.2", optional = true } 66tikv-jemallocator = { version = "0.4.1", optional = true }
67 67
68[dev-dependencies] 68[dev-dependencies]
69expect-test = "1.1" 69expect-test = "1.1"
@@ -72,5 +72,5 @@ mbe = { path = "../mbe" }
72tt = { path = "../tt" } 72tt = { path = "../tt" }
73 73
74[features] 74[features]
75jemalloc = ["jemallocator", "profile/jemalloc"] 75jemalloc = ["tikv-jemallocator", "profile/jemalloc"]
76force-always-assert = ["always-assert/force"] 76force-always-assert = ["always-assert/force"]