aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-05-07 20:47:09 +0100
committerGitHub <[email protected]>2021-05-07 20:47:09 +0100
commitba8620398713d6f116dd1cce1a7e1cd6e3f97461 (patch)
treea08967ef47b1f0f0d9468dd89bf34bb566160012 /crates
parent1ec82d4bdf47fa5ec1f8599757bbadae274d4f5a (diff)
parent4059112b4e6fbe6fd1b9c6640c031a2c346f6225 (diff)
Merge #8752
8752: Switch from jemalloc to tikv-jemalloc r=matklad a=djrenren Fixes https://github.com/rust-analyzer/rust-analyzer/issues/8252. No idea if we're still interested in this but it was a simple change so here's the PR. Co-authored-by: John Renner <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/profile/Cargo.toml2
-rw-r--r--crates/rust-analyzer/Cargo.toml2
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/profile/Cargo.toml b/crates/profile/Cargo.toml
index 486f9c164..1a8c8f862 100644
--- a/crates/profile/Cargo.toml
+++ b/crates/profile/Cargo.toml
@@ -15,7 +15,7 @@ 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 } 18jemalloc-ctl = { version = "0.4.1", package = "tikv-jemalloc-ctl", 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"
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 3e8f4bf89..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" }
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 } 66jemallocator = { version = "0.4.1", package = "tikv-jemallocator", optional = true }
67 67
68[dev-dependencies] 68[dev-dependencies]
69expect-test = "1.1" 69expect-test = "1.1"