Remove support for jemalloc

We only used it for measuring memory usage, but now we can use glibc's
allocator for that just fine
This commit is contained in:
Aleksey Kladov 2020-07-22 13:40:45 +02:00
parent 26932e0060
commit deed44a472
10 changed files with 7 additions and 109 deletions

View file

@ -57,8 +57,6 @@ fn dist_server() -> Result<()> {
env::set_var("CC", "clang");
run!(
"cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release"
// We'd want to add, but that requires setting the right linker somehow
// --features=jemalloc
)?;
} else {
run!("cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release")?;

View file

@ -24,7 +24,6 @@ pub struct ServerOpt {
pub enum Malloc {
System,
Jemalloc,
Mimalloc,
}
@ -138,7 +137,6 @@ fn install_server(opts: ServerOpt) -> Result<()> {
let malloc_feature = match opts.malloc {
Malloc::System => "",
Malloc::Jemalloc => "--features jemalloc",
Malloc::Mimalloc => "--features mimalloc",
};
let res = run!("cargo install --path crates/rust-analyzer --locked --force {}", malloc_feature);

View file

@ -45,7 +45,6 @@ USAGE:
FLAGS:
--client-code Install only VS Code plugin
--server Install only the language server
--jemalloc Use jemalloc for server
--mimalloc Use mimalloc for server
-h, --help Prints help information
"
@ -62,15 +61,8 @@ FLAGS:
return Ok(());
}
let malloc = match (args.contains("--jemalloc"), args.contains("--mimalloc")) {
(false, false) => Malloc::System,
(true, false) => Malloc::Jemalloc,
(false, true) => Malloc::Mimalloc,
(true, true) => {
eprintln!("error: Cannot use both `--jemalloc` and `--mimalloc`");
return Ok(());
}
};
let malloc =
if args.contains("--mimalloc") { Malloc::Mimalloc } else { Malloc::System };
args.finish()?;