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 /xtask/src/install.rs | |
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 'xtask/src/install.rs')
-rw-r--r-- | xtask/src/install.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/xtask/src/install.rs b/xtask/src/install.rs index a0dc0c9c2..b25a6e301 100644 --- a/xtask/src/install.rs +++ b/xtask/src/install.rs | |||
@@ -24,7 +24,6 @@ pub struct ServerOpt { | |||
24 | 24 | ||
25 | pub enum Malloc { | 25 | pub enum Malloc { |
26 | System, | 26 | System, |
27 | Jemalloc, | ||
28 | Mimalloc, | 27 | Mimalloc, |
29 | } | 28 | } |
30 | 29 | ||
@@ -138,7 +137,6 @@ fn install_server(opts: ServerOpt) -> Result<()> { | |||
138 | 137 | ||
139 | let malloc_feature = match opts.malloc { | 138 | let malloc_feature = match opts.malloc { |
140 | Malloc::System => "", | 139 | Malloc::System => "", |
141 | Malloc::Jemalloc => "--features jemalloc", | ||
142 | Malloc::Mimalloc => "--features mimalloc", | 140 | Malloc::Mimalloc => "--features mimalloc", |
143 | }; | 141 | }; |
144 | let res = run!("cargo install --path crates/rust-analyzer --locked --force {}", malloc_feature); | 142 | let res = run!("cargo install --path crates/rust-analyzer --locked --force {}", malloc_feature); |