Skip to content

Commit

Permalink
so uhh, jemalloc does not like msvc 👍
Browse files Browse the repository at this point in the history
  • Loading branch information
sokorototo committed Jan 5, 2024
1 parent 7fc3846 commit 448b3f7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vach/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
4 changes: 2 additions & 2 deletions vach/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 448b3f7

Please sign in to comment.