From 9252fa5c0d09054fed4ac4d649e63c40fad7abaf Mon Sep 17 00:00:00 2001
From: "pinkforest(she/her)" <36498018+pinkforest@users.noreply.github.com>
Date: Thu, 9 May 2024 23:24:16 +1000
Subject: [PATCH] Mitigate check-cfg until MSRV 1.77 (#652)

---
 curve25519-dalek-derive/tests/tests.rs | 9 +--------
 curve25519-dalek/src/lib.rs            | 2 ++
 curve25519-dalek/src/scalar.rs         | 2 ++
 x25519-dalek/src/lib.rs                | 1 -
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/curve25519-dalek-derive/tests/tests.rs b/curve25519-dalek-derive/tests/tests.rs
index 1516b3527..dce30c864 100644
--- a/curve25519-dalek-derive/tests/tests.rs
+++ b/curve25519-dalek-derive/tests/tests.rs
@@ -23,10 +23,6 @@ where
     a - b
 }
 
-#[unsafe_target_feature("sse2")]
-#[cfg(feature = "dummy")]
-fn function_with_cfg() {}
-
 #[unsafe_target_feature("sse2")]
 #[rustfmt::skip]
 fn function_with_rustfmt_skip() {}
@@ -45,9 +41,6 @@ impl Struct {
     fn member_function_with_const_arg<const N: u32>(self) -> u32 {
         self.a - N
     }
-
-    #[cfg(feature = "dummy")]
-    fn member_function_with_cfg() {}
 }
 
 struct StructWithGenerics<T>
@@ -93,7 +86,7 @@ mod inner {
     }
 }
 
-#[unsafe_target_feature_specialize("sse2", "avx2", conditional("avx512ifma", disabled))]
+#[unsafe_target_feature_specialize("sse2", "avx2")]
 mod inner_spec {
     #[for_target_feature("sse2")]
     const CONST: u32 = 1;
diff --git a/curve25519-dalek/src/lib.rs b/curve25519-dalek/src/lib.rs
index d8666453c..fecfe888c 100644
--- a/curve25519-dalek/src/lib.rs
+++ b/curve25519-dalek/src/lib.rs
@@ -42,6 +42,8 @@
     unused_lifetimes,
     unused_qualifications
 )]
+// Requires MSRV 1.77 as it does not allow build.rs gating
+#![allow(unexpected_cfgs)]
 
 //------------------------------------------------------------------------
 // External dependencies:
diff --git a/curve25519-dalek/src/scalar.rs b/curve25519-dalek/src/scalar.rs
index 5e0d1c96b..6afd74eef 100644
--- a/curve25519-dalek/src/scalar.rs
+++ b/curve25519-dalek/src/scalar.rs
@@ -1233,10 +1233,12 @@ impl Field for Scalar {
     }
 
     fn sqrt_ratio(num: &Self, div: &Self) -> (Choice, Self) {
+        #[allow(unused_qualifications)]
         group::ff::helpers::sqrt_ratio_generic(num, div)
     }
 
     fn sqrt(&self) -> CtOption<Self> {
+        #[allow(unused_qualifications)]
         group::ff::helpers::sqrt_tonelli_shanks(
             self,
             [
diff --git a/x25519-dalek/src/lib.rs b/x25519-dalek/src/lib.rs
index 9a5fc1938..7886eeaa5 100644
--- a/x25519-dalek/src/lib.rs
+++ b/x25519-dalek/src/lib.rs
@@ -15,7 +15,6 @@
 // README.md as the crate documentation.
 
 #![no_std]
-#![cfg_attr(feature = "bench", feature(test))]
 #![cfg_attr(docsrs, feature(doc_auto_cfg, doc_cfg, doc_cfg_hide))]
 #![cfg_attr(docsrs, doc(cfg_hide(docsrs)))]
 #![deny(missing_docs)]