From 448b3f72368a0137f2007743189320b1ce9dfbd2 Mon Sep 17 00:00:00 2001 From: sokorototo Date: Fri, 5 Jan 2024 13:31:14 +0300 Subject: [PATCH] =?UTF-8?q?so=20uhh,=20jemalloc=20does=20not=20like=20msvc?= =?UTF-8?q?=20=F0=9F=91=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 2 +- vach/Cargo.toml | 2 +- vach/src/lib.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a531892b..cafe50f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1274,7 +1274,7 @@ dependencies = [ [[package]] name = "vach" -version = "0.5.1" +version = "0.5.2" dependencies = [ "aes-gcm", "brotli", diff --git a/vach/Cargo.toml b/vach/Cargo.toml index 9ef8650c..76d5985a 100644 --- a/vach/Cargo.toml +++ b/vach/Cargo.toml @@ -2,7 +2,7 @@ name = "vach" # NOTE: Make sure spec.txt and vach::VERSION constants are all synced up -version = "0.5.1" +version = "0.5.2" edition = "2021" authors = [ diff --git a/vach/src/lib.rs b/vach/src/lib.rs index e7caff16..a368709e 100644 --- a/vach/src/lib.rs +++ b/vach/src/lib.rs @@ -24,7 +24,7 @@ It was built to be secure, contained and protected. A big benefit of `vach` is t - `multithreaded`: Pulls [rayon](https://crates.io/crates/rayon) as a dependency and adds [`Send`] as a trait bound to many generic types. This allows for the auto-parallelization of the `Builder::dump(---)` function. - `compression`: Pulls `snap`, `lz4_flex` and `brotli` as dependencies and allows for compression in `vach` archives. - `crypto`: Enables encryption and authentication functionality by pulling the `ed25519_dalek` and `aes_gcm` crates -- `tikv-jemallocator`: Enable `jemalloc`` as the global allocator. Enabled by the [`tikv-jemallocator`](https://crates.io/crates/tikv-jemallocator) craate +- `tikv-jemallocator`: Enable `jemalloc`` as the global allocator. Enabled by the [`tikv-jemallocator`](https://crates.io/crates/tikv-jemallocator) crate, don't enable on `x86_64-pc-windows-msvc` - `default`: Enables the `archive` and `builder` features. - `all`: Enables all the features listed above. @@ -122,7 +122,7 @@ mod tests; pub(crate) mod global; /// Optionally enable jemalloc -#[cfg(feature = "jemalloc")] +#[cfg(all(feature = "jemalloc", not(target_env = "msvc")))] #[global_allocator] static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;