mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #8752

Browse Source 
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 <john@jrenner.net>
This commit is contained in:
bors[bot] 2021-05-07 19:47:09 +00:00 committed by GitHub
commit ba86203987
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Cargo.lock generated
View File

@ -749,38 +749,6 @@ version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
[[package]]
name = "jemalloc-ctl"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c502a5ff9dd2924f1ed32ba96e3b65735d837b4bfd978d3161b1702e66aca4b7"
dependencies = [
"jemalloc-sys",
"libc",
"paste",
]
[[package]]
name = "jemalloc-sys"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d3b9f3f5c9b31aa0f5ed3260385ac205db665baa41d49bb8338008ae94ede45"
dependencies = [
"cc",
"fs_extra",
"libc",
]
[[package]]
name = "jemallocator"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43ae63fcfc45e99ab3d1b29a46782ad679e98436c3169d15a167a1108a724b69"
dependencies = [
"jemalloc-sys",
"libc",
]
[[package]]
name = "jod-thread"
version = "0.1.2"
@ -1201,11 +1169,11 @@ version = "0.0.0"
dependencies = [
"cfg-if",
"countme",
"jemalloc-ctl",
"la-arena",
"libc",
"once_cell",
"perf-event",
"tikv-jemalloc-ctl",
]
[[package]]
@ -1349,7 +1317,6 @@ dependencies = [
"ide_db",
"ide_ssr",
"itertools",
"jemallocator",
"jod-thread",
"log",
"lsp-server",
@ -1371,6 +1338,7 @@ dependencies = [
"test_utils",
"text_edit",
"threadpool",
"tikv-jemallocator",
"toolchain",
"tracing",
"tracing-subscriber",
@ -1669,6 +1637,38 @@ dependencies = [
"num_cpus",
]
[[package]]
name = "tikv-jemalloc-ctl"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f28c80e4338857639f443169a601fafe49866aed8d7a8d565c2f5bfb1a021adf"
dependencies = [
"libc",
"paste",
"tikv-jemalloc-sys",
]
[[package]]
name = "tikv-jemalloc-sys"
version = "0.4.1+5.2.1-patched"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a26331b05179d4cb505c8d6814a7e18d298972f0a551b0e3cefccff927f86d3"
dependencies = [
"cc",
"fs_extra",
"libc",
]
[[package]]
name = "tikv-jemallocator"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c14a5a604eb8715bc5785018a37d00739b180bcf609916ddf4393d33d49ccdf"
dependencies = [
"libc",
"tikv-jemalloc-sys",
]
[[package]]
name = "tinyvec"
version = "1.2.0"

2
crates/profile/Cargo.toml
View File

@ -15,7 +15,7 @@ cfg-if = "1"
libc = "0.2.73"
la-arena = { version = "0.2.0", path = "../../lib/arena" }
countme = { version = "2.0.1", features = ["enable"] }
jemalloc-ctl = { version = "0.3.3", optional = true }
jemalloc-ctl = { version = "0.4.1", package = "tikv-jemalloc-ctl", optional = true }
[target.'cfg(target_os = "linux")'.dependencies]
perf-event = "0.4"

2
crates/rust-analyzer/Cargo.toml
View File

@ -63,7 +63,7 @@ proc_macro_srv = { path = "../proc_macro_srv", version = "0.0.0" }
winapi = "0.3.8"
[target.'cfg(not(target_env = "msvc"))'.dependencies]
jemallocator = { version = "0.3.2", optional = true }
jemallocator = { version = "0.4.1", package = "tikv-jemallocator", optional = true }
[dev-dependencies]
expect-test = "1.1"