aboutsummaryrefslogtreecommitdiff
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
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]>
-rw-r--r--Cargo.lock68
-rw-r--r--crates/profile/Cargo.toml2
-rw-r--r--crates/rust-analyzer/Cargo.toml2
3 files changed, 36 insertions, 36 deletions
diff --git a/Cargo.lock b/Cargo.lock
index c378014f0..f3a512a8a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -750,38 +750,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
750checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" 750checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
751 751
752[[package]] 752[[package]]
753name = "jemalloc-ctl"
754version = "0.3.3"
755source = "registry+https://github.com/rust-lang/crates.io-index"
756checksum = "c502a5ff9dd2924f1ed32ba96e3b65735d837b4bfd978d3161b1702e66aca4b7"
757dependencies = [
758 "jemalloc-sys",
759 "libc",
760 "paste",
761]
762
763[[package]]
764name = "jemalloc-sys"
765version = "0.3.2"
766source = "registry+https://github.com/rust-lang/crates.io-index"
767checksum = "0d3b9f3f5c9b31aa0f5ed3260385ac205db665baa41d49bb8338008ae94ede45"
768dependencies = [
769 "cc",
770 "fs_extra",
771 "libc",
772]
773
774[[package]]
775name = "jemallocator"
776version = "0.3.2"
777source = "registry+https://github.com/rust-lang/crates.io-index"
778checksum = "43ae63fcfc45e99ab3d1b29a46782ad679e98436c3169d15a167a1108a724b69"
779dependencies = [
780 "jemalloc-sys",
781 "libc",
782]
783
784[[package]]
785name = "jod-thread" 753name = "jod-thread"
786version = "0.1.2" 754version = "0.1.2"
787source = "registry+https://github.com/rust-lang/crates.io-index" 755source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1201,11 +1169,11 @@ version = "0.0.0"
1201dependencies = [ 1169dependencies = [
1202 "cfg-if", 1170 "cfg-if",
1203 "countme", 1171 "countme",
1204 "jemalloc-ctl",
1205 "la-arena", 1172 "la-arena",
1206 "libc", 1173 "libc",
1207 "once_cell", 1174 "once_cell",
1208 "perf-event", 1175 "perf-event",
1176 "tikv-jemalloc-ctl",
1209] 1177]
1210 1178
1211[[package]] 1179[[package]]
@@ -1349,7 +1317,6 @@ dependencies = [
1349 "ide_db", 1317 "ide_db",
1350 "ide_ssr", 1318 "ide_ssr",
1351 "itertools", 1319 "itertools",
1352 "jemallocator",
1353 "jod-thread", 1320 "jod-thread",
1354 "log", 1321 "log",
1355 "lsp-server", 1322 "lsp-server",
@@ -1371,6 +1338,7 @@ dependencies = [
1371 "test_utils", 1338 "test_utils",
1372 "text_edit", 1339 "text_edit",
1373 "threadpool", 1340 "threadpool",
1341 "tikv-jemallocator",
1374 "toolchain", 1342 "toolchain",
1375 "tracing", 1343 "tracing",
1376 "tracing-subscriber", 1344 "tracing-subscriber",
@@ -1670,6 +1638,38 @@ dependencies = [
1670] 1638]
1671 1639
1672[[package]] 1640[[package]]
1641name = "tikv-jemalloc-ctl"
1642version = "0.4.1"
1643source = "registry+https://github.com/rust-lang/crates.io-index"
1644checksum = "f28c80e4338857639f443169a601fafe49866aed8d7a8d565c2f5bfb1a021adf"
1645dependencies = [
1646 "libc",
1647 "paste",
1648 "tikv-jemalloc-sys",
1649]
1650
1651[[package]]
1652name = "tikv-jemalloc-sys"
1653version = "0.4.1+5.2.1-patched"
1654source = "registry+https://github.com/rust-lang/crates.io-index"
1655checksum = "8a26331b05179d4cb505c8d6814a7e18d298972f0a551b0e3cefccff927f86d3"
1656dependencies = [
1657 "cc",
1658 "fs_extra",
1659 "libc",
1660]
1661
1662[[package]]
1663name = "tikv-jemallocator"
1664version = "0.4.1"
1665source = "registry+https://github.com/rust-lang/crates.io-index"
1666checksum = "3c14a5a604eb8715bc5785018a37d00739b180bcf609916ddf4393d33d49ccdf"
1667dependencies = [
1668 "libc",
1669 "tikv-jemalloc-sys",
1670]
1671
1672[[package]]
1673name = "tinyvec" 1673name = "tinyvec"
1674version = "1.2.0" 1674version = "1.2.0"
1675source = "registry+https://github.com/rust-lang/crates.io-index" 1675source = "registry+https://github.com/rust-lang/crates.io-index"
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"