diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-22 12:44:05 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-22 12:44:05 +0100 |
commit | 2dd8ba2b21e3262f25e4245e37549206c8a3bc2d (patch) | |
tree | 6dfcadbf3b6a333777f22f54db773118bf1916d4 /Cargo.lock | |
parent | 26932e0060b74525f74df5e31ae0c88997e5d667 (diff) | |
parent | 9ad41eb9085cd7ceaf479f659a7071df81059b7c (diff) |
Merge #5487
5487: Setup global allocator in the correct crate r=matklad a=matklad
It worked before, but was roundabout
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'Cargo.lock')
-rw-r--r-- | Cargo.lock | 67 |
1 files changed, 1 insertions, 66 deletions
diff --git a/Cargo.lock b/Cargo.lock index 4a8271f09..280d97432 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -360,12 +360,6 @@ dependencies = [ | |||
360 | ] | 360 | ] |
361 | 361 | ||
362 | [[package]] | 362 | [[package]] |
363 | name = "fs_extra" | ||
364 | version = "1.1.0" | ||
365 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
366 | checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" | ||
367 | |||
368 | [[package]] | ||
369 | name = "fsevent" | 363 | name = "fsevent" |
370 | version = "2.0.2" | 364 | version = "2.0.2" |
371 | source = "registry+https://github.com/rust-lang/crates.io-index" | 365 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -542,38 +536,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
542 | checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" | 536 | checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" |
543 | 537 | ||
544 | [[package]] | 538 | [[package]] |
545 | name = "jemalloc-ctl" | ||
546 | version = "0.3.3" | ||
547 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
548 | checksum = "c502a5ff9dd2924f1ed32ba96e3b65735d837b4bfd978d3161b1702e66aca4b7" | ||
549 | dependencies = [ | ||
550 | "jemalloc-sys", | ||
551 | "libc", | ||
552 | "paste", | ||
553 | ] | ||
554 | |||
555 | [[package]] | ||
556 | name = "jemalloc-sys" | ||
557 | version = "0.3.2" | ||
558 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
559 | checksum = "0d3b9f3f5c9b31aa0f5ed3260385ac205db665baa41d49bb8338008ae94ede45" | ||
560 | dependencies = [ | ||
561 | "cc", | ||
562 | "fs_extra", | ||
563 | "libc", | ||
564 | ] | ||
565 | |||
566 | [[package]] | ||
567 | name = "jemallocator" | ||
568 | version = "0.3.2" | ||
569 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
570 | checksum = "43ae63fcfc45e99ab3d1b29a46782ad679e98436c3169d15a167a1108a724b69" | ||
571 | dependencies = [ | ||
572 | "jemalloc-sys", | ||
573 | "libc", | ||
574 | ] | ||
575 | |||
576 | [[package]] | ||
577 | name = "jod-thread" | 539 | name = "jod-thread" |
578 | version = "0.1.2" | 540 | version = "0.1.2" |
579 | source = "registry+https://github.com/rust-lang/crates.io-index" | 541 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -875,25 +837,6 @@ dependencies = [ | |||
875 | ] | 837 | ] |
876 | 838 | ||
877 | [[package]] | 839 | [[package]] |
878 | name = "paste" | ||
879 | version = "0.1.18" | ||
880 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
881 | checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" | ||
882 | dependencies = [ | ||
883 | "paste-impl", | ||
884 | "proc-macro-hack", | ||
885 | ] | ||
886 | |||
887 | [[package]] | ||
888 | name = "paste-impl" | ||
889 | version = "0.1.18" | ||
890 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
891 | checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" | ||
892 | dependencies = [ | ||
893 | "proc-macro-hack", | ||
894 | ] | ||
895 | |||
896 | [[package]] | ||
897 | name = "paths" | 840 | name = "paths" |
898 | version = "0.1.0" | 841 | version = "0.1.0" |
899 | 842 | ||
@@ -932,12 +875,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
932 | checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" | 875 | checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" |
933 | 876 | ||
934 | [[package]] | 877 | [[package]] |
935 | name = "proc-macro-hack" | ||
936 | version = "0.5.16" | ||
937 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
938 | checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" | ||
939 | |||
940 | [[package]] | ||
941 | name = "proc-macro2" | 878 | name = "proc-macro2" |
942 | version = "1.0.19" | 879 | version = "1.0.19" |
943 | source = "registry+https://github.com/rust-lang/crates.io-index" | 880 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -1199,10 +1136,7 @@ version = "0.1.0" | |||
1199 | dependencies = [ | 1136 | dependencies = [ |
1200 | "backtrace", | 1137 | "backtrace", |
1201 | "cfg-if", | 1138 | "cfg-if", |
1202 | "jemalloc-ctl", | ||
1203 | "jemallocator", | ||
1204 | "libc", | 1139 | "libc", |
1205 | "mimalloc", | ||
1206 | "once_cell", | 1140 | "once_cell", |
1207 | "ra_arena", | 1141 | "ra_arena", |
1208 | ] | 1142 | ] |
@@ -1427,6 +1361,7 @@ dependencies = [ | |||
1427 | "log", | 1361 | "log", |
1428 | "lsp-server", | 1362 | "lsp-server", |
1429 | "lsp-types", | 1363 | "lsp-types", |
1364 | "mimalloc", | ||
1430 | "parking_lot", | 1365 | "parking_lot", |
1431 | "pico-args", | 1366 | "pico-args", |
1432 | "ra_cfg", | 1367 | "ra_cfg", |