Skip to content

Commit 95eb4f4

Browse files
committed
Issue #207: Rollback MSRV bump (#208)
Signed-off-by: Tom Kaitchuck <Tom.Kaitchuck@gmail.com>
1 parent 669de23 commit 95eb4f4

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ edition = "2018"
1212
readme = "README.md"
1313
build = "./build.rs"
1414
exclude = ["/smhasher", "/benchmark_tools"]
15-
rust-version = "1.72.0"
15+
rust-version = "1.60.0"
1616

1717
[lib]
1818
name = "ahash"

src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ mod fallback_hash;
108108
cfg_if::cfg_if! {
109109
if #[cfg(any(
110110
all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri)),
111-
all(target_arch = "aarch64", target_feature = "aes", not(miri)),
111+
all(feature = "nightly-arm-aes", target_arch = "aarch64", target_feature = "aes", not(miri)),
112112
all(feature = "nightly-arm-aes", target_arch = "arm", target_feature = "aes", not(miri)),
113113
))] {
114114
mod aes_hash;

src/operations.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use crate::convert::*;
2+
#[allow(unused)]
23
use zerocopy::transmute;
34

45
///This constant comes from Kunth's prng (Empirically it works better than those from splitmix32).
@@ -111,7 +112,7 @@ pub(crate) fn aesenc(value: u128, xor: u128) -> u128 {
111112
}
112113

113114
#[cfg(any(
114-
all(target_arch = "aarch64", target_feature = "aes", not(miri)),
115+
all(feature = "nightly-arm-aes", target_arch = "aarch64", target_feature = "aes", not(miri)),
115116
all(feature = "nightly-arm-aes", target_arch = "arm", target_feature = "aes", not(miri)),
116117
))]
117118
#[allow(unused)]
@@ -141,7 +142,7 @@ pub(crate) fn aesdec(value: u128, xor: u128) -> u128 {
141142
}
142143

143144
#[cfg(any(
144-
all(target_arch = "aarch64", target_feature = "aes", not(miri)),
145+
all(feature = "nightly-arm-aes", target_arch = "aarch64", target_feature = "aes", not(miri)),
145146
all(feature = "nightly-arm-aes", target_arch = "arm", target_feature = "aes", not(miri)),
146147
))]
147148
#[allow(unused)]

src/random_state.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use core::hash::Hash;
22
cfg_if::cfg_if! {
33
if #[cfg(any(
44
all(any(target_arch = "x86", target_arch = "x86_64"), target_feature = "aes", not(miri)),
5-
all(target_arch = "aarch64", target_feature = "aes", not(miri)),
5+
all(feature = "nightly-arm-aes", target_arch = "aarch64", target_feature = "aes", not(miri)),
66
all(feature = "nightly-arm-aes", target_arch = "arm", target_feature = "aes", not(miri)),
77
))] {
88
use crate::aes_hash::*;

tests/bench.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const AHASH_IMPL: &str = if cfg!(any(
1414
target_feature = "aes",
1515
not(miri),
1616
),
17-
all(target_arch = "aarch64", target_feature = "aes", not(miri)),
17+
all(feature = "nightly-arm-aes", target_arch = "aarch64", target_feature = "aes", not(miri)),
1818
all(
1919
feature = "nightly-arm-aes",
2020
target_arch = "arm",

0 commit comments

Comments
 (0)