Skip to content
This repository was archived by the owner on Sep 22, 2025. It is now read-only.

Commit f363fe2

Browse files
committed
delete aes
1 parent db36e4c commit f363fe2

File tree

6 files changed

+21
-32
lines changed

6 files changed

+21
-32
lines changed

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,4 @@ hashbrown = "0.14.3"
103103
smallvec = "1.13.1"
104104

105105
[package.metadata.docs.rs]
106-
rustc-args = ["-C", "target-feature=+aes"]
107-
rustdoc-args = ["-C", "target-feature=+aes"]
108106
features = ["std"]

src/lib.rs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,19 +104,7 @@ Note the import of [HashMapExt]. This is needed for the constructor.
104104
mod convert;
105105

106106
mod fallback_hash;
107-
108-
cfg_if::cfg_if! {
109-
if #[cfg(any(
110-
all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri)),
111-
all(feature = "nightly-arm-aes", target_arch = "aarch64", target_feature = "aes", not(miri)),
112-
all(feature = "nightly-arm-aes", target_arch = "arm", target_feature = "aes", not(miri)),
113-
))] {
114-
mod aes_hash;
115-
pub use crate::aes_hash::AHasher;
116-
} else {
117-
pub use crate::fallback_hash::AHasher;
118-
}
119-
}
107+
pub use crate::fallback_hash::AHasher;
120108

121109
cfg_if::cfg_if! {
122110
if #[cfg(feature = "std")] {

src/operations.rs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,12 @@ pub(crate) fn aesenc(value: u128, xor: u128) -> u128 {
112112
}
113113

114114
#[cfg(any(
115-
all(feature = "nightly-arm-aes", target_arch = "aarch64", target_feature = "aes", not(miri)),
115+
all(
116+
feature = "nightly-arm-aes",
117+
target_arch = "aarch64",
118+
target_feature = "aes",
119+
not(miri)
120+
),
116121
all(feature = "nightly-arm-aes", target_arch = "arm", target_feature = "aes", not(miri)),
117122
))]
118123
#[allow(unused)]
@@ -142,7 +147,12 @@ pub(crate) fn aesdec(value: u128, xor: u128) -> u128 {
142147
}
143148

144149
#[cfg(any(
145-
all(feature = "nightly-arm-aes", target_arch = "aarch64", target_feature = "aes", not(miri)),
150+
all(
151+
feature = "nightly-arm-aes",
152+
target_arch = "aarch64",
153+
target_feature = "aes",
154+
not(miri)
155+
),
146156
all(feature = "nightly-arm-aes", target_arch = "arm", target_feature = "aes", not(miri)),
147157
))]
148158
#[allow(unused)]

src/random_state.rs

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
1+
use crate::fallback_hash::*;
12
use core::hash::Hash;
2-
cfg_if::cfg_if! {
3-
if #[cfg(any(
4-
all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri)),
5-
all(feature = "nightly-arm-aes", target_arch = "aarch64", target_feature = "aes", not(miri)),
6-
all(feature = "nightly-arm-aes", target_arch = "arm", target_feature = "aes", not(miri)),
7-
))] {
8-
use crate::aes_hash::*;
9-
} else {
10-
use crate::fallback_hash::*;
11-
}
12-
}
133
cfg_if::cfg_if! {
144
if #[cfg(feature = "specialize")]{
155
use crate::BuildHasherExt;

tests/bench.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ const AHASH_IMPL: &str = if cfg!(any(
1414
target_feature = "aes",
1515
not(miri),
1616
),
17-
all(feature = "nightly-arm-aes", target_arch = "aarch64", target_feature = "aes", not(miri)),
17+
all(
18+
feature = "nightly-arm-aes",
19+
target_arch = "aarch64",
20+
target_feature = "aes",
21+
not(miri)
22+
),
1823
all(
1924
feature = "nightly-arm-aes",
2025
target_arch = "arm",

tests/map_tests.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ fn test_ahash_alias_set_construction() {
200200
set.insert(1);
201201
}
202202

203-
204203
#[cfg(feature = "std")]
205204
#[test]
206205
fn test_key_ref() {
@@ -228,8 +227,8 @@ fn test_key_ref() {
228227
#[cfg(feature = "std")]
229228
#[test]
230229
fn test_byte_dist() {
231-
use rand::{SeedableRng, Rng, RngCore};
232230
use pcg_mwc::Mwc256XXA64;
231+
use rand::{Rng, RngCore, SeedableRng};
233232

234233
let mut r = Mwc256XXA64::seed_from_u64(0xe786_c22b_119c_1479);
235234
let mut lowest = 2.541;
@@ -275,7 +274,6 @@ fn test_byte_dist() {
275274
assert!(highest < 3.9, "Highest = {}", highest);
276275
}
277276

278-
279277
fn ahash_vec<H: Hash>(b: &Vec<H>) -> u64 {
280278
let mut total: u64 = 0;
281279
for item in b {

0 commit comments

Comments
 (0)