From 7f917150b29009b273341b774ede1eb2e5fcc2c2 Mon Sep 17 00:00:00 2001
From: Brian Smith <brian@briansmith.org>
Date: Mon, 5 May 2025 12:39:26 -0700
Subject: [PATCH] Don't condition "aes" support for AArch64 on feature
 "nightly-arm-aes".

The documentation says that this is enabled automatically when the
target feature is enabled.
---
 src/hash_quality_test.rs | 2 +-
 src/lib.rs               | 2 +-
 src/operations.rs        | 4 ++--
 src/random_state.rs      | 2 +-
 tests/bench.rs           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hash_quality_test.rs b/src/hash_quality_test.rs
index a874100..24a7b08 100644
--- a/src/hash_quality_test.rs
+++ b/src/hash_quality_test.rs
@@ -441,7 +441,7 @@ mod fallback_tests {
 ///Basic sanity tests of the cypto properties of aHash.
 #[cfg(any(
     all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri)),
-    all(feature = "nightly-arm-aes", target_arch = "aarch64", target_feature = "aes", not(miri)),
+    all(target_arch = "aarch64", target_feature = "aes", not(miri)),
     all(feature = "nightly-arm-aes", target_arch = "arm", target_feature = "aes", not(miri)),
 ))]
 #[cfg(test)]
diff --git a/src/lib.rs b/src/lib.rs
index d937dca..b90ce94 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -108,7 +108,7 @@ mod fallback_hash;
 cfg_if::cfg_if! {
     if #[cfg(any(
             all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri)),
-            all(feature = "nightly-arm-aes", target_arch = "aarch64", target_feature = "aes", not(miri)),
+            all(target_arch = "aarch64", target_feature = "aes", not(miri)),
             all(feature = "nightly-arm-aes", target_arch = "arm", target_feature = "aes", not(miri)),
         ))] {
         mod aes_hash;
diff --git a/src/operations.rs b/src/operations.rs
index 4509c52..571cd2e 100644
--- a/src/operations.rs
+++ b/src/operations.rs
@@ -112,7 +112,7 @@ pub(crate) fn aesenc(value: u128, xor: u128) -> u128 {
 }
 
 #[cfg(any(
-    all(feature = "nightly-arm-aes", target_arch = "aarch64", target_feature = "aes", not(miri)),
+    all(target_arch = "aarch64", target_feature = "aes", not(miri)),
     all(feature = "nightly-arm-aes", target_arch = "arm", target_feature = "aes", not(miri)),
 ))]
 #[allow(unused)]
@@ -142,7 +142,7 @@ pub(crate) fn aesdec(value: u128, xor: u128) -> u128 {
 }
 
 #[cfg(any(
-    all(feature = "nightly-arm-aes", target_arch = "aarch64", target_feature = "aes", not(miri)),
+    all(target_arch = "aarch64", target_feature = "aes", not(miri)),
     all(feature = "nightly-arm-aes", target_arch = "arm", target_feature = "aes", not(miri)),
 ))]
 #[allow(unused)]
diff --git a/src/random_state.rs b/src/random_state.rs
index 114f6f9..b7c94a7 100644
--- a/src/random_state.rs
+++ b/src/random_state.rs
@@ -2,7 +2,7 @@ use core::hash::Hash;
 cfg_if::cfg_if! {
     if #[cfg(any(
         all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri)),
-        all(feature = "nightly-arm-aes", target_arch = "aarch64", target_feature = "aes", not(miri)),
+        all(target_arch = "aarch64", target_feature = "aes", not(miri)),
         all(feature = "nightly-arm-aes", target_arch = "arm", target_feature = "aes", not(miri)),
     ))] {
         use crate::aes_hash::*;
diff --git a/tests/bench.rs b/tests/bench.rs
index 2d000c0..d1212f4 100644
--- a/tests/bench.rs
+++ b/tests/bench.rs
@@ -14,7 +14,7 @@ const AHASH_IMPL: &str = if cfg!(any(
         target_feature = "aes",
         not(miri),
     ),
-    all(feature = "nightly-arm-aes", target_arch = "aarch64", target_feature = "aes", not(miri)),
+    all(target_arch = "aarch64", target_feature = "aes", not(miri)),
     all(
         feature = "nightly-arm-aes",
         target_arch = "arm",