From a0eb9ba2d386d042f1a0250c321e98a314254adc Mon Sep 17 00:00:00 2001 From: Tim Fennis Date: Mon, 2 Mar 2026 21:19:19 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Remove=20ahash=20feature=20flag,?= =?UTF-8?q?=20hardcode=20AHash=20everywhere?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ndc_lib/Cargo.toml | 5 +---- ndc_lib/src/hash_map.rs | 7 ------- ndc_stdlib/Cargo.toml | 3 +-- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/ndc_lib/Cargo.toml b/ndc_lib/Cargo.toml index 8f82daf7..9692c983 100644 --- a/ndc_lib/Cargo.toml +++ b/ndc_lib/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true version.workspace = true [dependencies] -ahash = { workspace = true, optional = true } +ahash.workspace = true anyhow.workspace = true derive_more.workspace = true derive_builder.workspace = true @@ -18,6 +18,3 @@ ryu.workspace = true self_cell.workspace = true thiserror.workspace = true -[features] -default = ["ahash"] -ahash = ["dep:ahash"] diff --git a/ndc_lib/src/hash_map.rs b/ndc_lib/src/hash_map.rs index 84f03969..39158583 100644 --- a/ndc_lib/src/hash_map.rs +++ b/ndc_lib/src/hash_map.rs @@ -1,12 +1,5 @@ -#[cfg(feature = "ahash")] pub use ahash::AHashMap as HashMap; -#[cfg(not(feature = "ahash"))] -pub use std::collections::HashMap; - -#[cfg(feature = "ahash")] pub use ahash::AHasher as DefaultHasher; -#[cfg(not(feature = "ahash"))] -pub use std::hash::DefaultHasher; use std::hash::Hash; diff --git a/ndc_stdlib/Cargo.toml b/ndc_stdlib/Cargo.toml index 8da35e51..fe7bf513 100644 --- a/ndc_stdlib/Cargo.toml +++ b/ndc_stdlib/Cargo.toml @@ -21,6 +21,5 @@ md5 = { version = "0.8.0", optional = true } sha1 = { version = "0.10.6", optional = true } [features] -default = ["ahash", "crypto"] -ahash = ["ndc_lib/ahash"] +default = ["crypto"] crypto = ["dep:md5", "dep:sha1"]