Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use default allocator as a default (#11293)

Browse source
This commit is contained in:
Kirill Bulatov 2024-05-02 14:05:42 +03:00 • committed by GitHub
parent aeff468e9c
commit 092869d1fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/zed/Cargo.toml
View file

@ -61,7 +61,7 @@ languages.workspace = true
log.workspace = true
markdown_preview.workspace = true
menu.workspace = true
mimalloc = "0.1"
mimalloc = { version = "0.1", optional = true }
nix = {workspace = true, features = ["pthread"] }
node_runtime.workspace = true
notifications.workspace = true

4
crates/zed/src/main.rs
View file

@ -24,7 +24,6 @@ use language::LanguageRegistry;
use log::LevelFilter;
use assets::Assets;
use mimalloc::MiMalloc;
use node_runtime::RealNodeRuntime;
use parking_lot::Mutex;
use release_channel::AppCommitSha;
@ -56,8 +55,9 @@ use zed::{
OpenListener, OpenRequest,
};
#[cfg(feature = "mimalloc")]
#[global_allocator]
static GLOBAL: MiMalloc = MiMalloc;
static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
fn fail_to_launch(e: anyhow::Error) {
App::new().run(move |cx| {