Skip to content

Commit ba86203

Browse files
bors[bot]djrenren
andauthored
Merge #8752
8752: Switch from jemalloc to tikv-jemalloc r=matklad a=djrenren Fixes #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]>
2 parents 1ec82d4 + 4059112 commit ba86203

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

Cargo.lock

Lines changed: 34 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/profile/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cfg-if = "1"
1515
libc = "0.2.73"
1616
la-arena = { version = "0.2.0", path = "../../lib/arena" }
1717
countme = { version = "2.0.1", features = ["enable"] }
18-
jemalloc-ctl = { version = "0.3.3", optional = true }
18+
jemalloc-ctl = { version = "0.4.1", package = "tikv-jemalloc-ctl", optional = true }
1919

2020
[target.'cfg(target_os = "linux")'.dependencies]
2121
perf-event = "0.4"

crates/rust-analyzer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ proc_macro_srv = { path = "../proc_macro_srv", version = "0.0.0" }
6363
winapi = "0.3.8"
6464

6565
[target.'cfg(not(target_env = "msvc"))'.dependencies]
66-
jemallocator = { version = "0.3.2", optional = true }
66+
jemallocator = { version = "0.4.1", package = "tikv-jemallocator", optional = true }
6767

6868
[dev-dependencies]
6969
expect-test = "1.1"

0 commit comments

Comments
 (0)