From 24019783e9bb9dc1464e7e503732f273a69969c6 Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Tue, 6 Feb 2024 14:47:42 +1100 Subject: [PATCH 1/3] Fix nightly build --- curve25519-dalek/src/lib.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/curve25519-dalek/src/lib.rs b/curve25519-dalek/src/lib.rs index 9097a9a8f..3b11e3add 100644 --- a/curve25519-dalek/src/lib.rs +++ b/curve25519-dalek/src/lib.rs @@ -10,7 +10,10 @@ // - Henry de Valence #![no_std] -#![cfg_attr(all(curve25519_dalek_backend = "simd", nightly), feature(stdsimd))] +#![cfg_attr( + all(curve25519_dalek_backend = "simd", nightly), + feature(stdarch_x86_avx512) +)] #![cfg_attr( all(curve25519_dalek_backend = "simd", nightly), feature(avx512_target_feature) From 6a091fa59c68a6c73fcfe3ebd653bae3cabe5fa1 Mon Sep 17 00:00:00 2001 From: Michael Rosenberg Date: Tue, 6 Feb 2024 13:56:28 -0500 Subject: [PATCH 2/3] Add nightly feature constraint so AVX-512 requires either x86 or x86_64 Co-authored-by: Tony Arcieri --- curve25519-dalek/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/curve25519-dalek/src/lib.rs b/curve25519-dalek/src/lib.rs index 3b11e3add..1f6259ddc 100644 --- a/curve25519-dalek/src/lib.rs +++ b/curve25519-dalek/src/lib.rs @@ -11,7 +11,7 @@ #![no_std] #![cfg_attr( - all(curve25519_dalek_backend = "simd", nightly), + all(curve25519_dalek_backend = "simd", nightly, any(target_arch = "x86", target_arch = "x86_64")), feature(stdarch_x86_avx512) )] #![cfg_attr( From 7ca849b3d9b89d0f9ee66a98a2d72d86b537c7be Mon Sep 17 00:00:00 2001 From: Michael Rosenberg Date: Tue, 6 Feb 2024 14:02:54 -0500 Subject: [PATCH 3/3] fmt --- curve25519-dalek/src/lib.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/curve25519-dalek/src/lib.rs b/curve25519-dalek/src/lib.rs index 1f6259ddc..d8666453c 100644 --- a/curve25519-dalek/src/lib.rs +++ b/curve25519-dalek/src/lib.rs @@ -11,7 +11,11 @@ #![no_std] #![cfg_attr( - all(curve25519_dalek_backend = "simd", nightly, any(target_arch = "x86", target_arch = "x86_64")), + all( + curve25519_dalek_backend = "simd", + nightly, + any(target_arch = "x86", target_arch = "x86_64") + ), feature(stdarch_x86_avx512) )] #![cfg_attr(