From 35e78b21efb61a1de148cbcf4cfe2c3d559fbec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20W=C3=BClker?= <simon.wuelker@arcor.de>
Date: Fri, 26 Jul 2024 04:24:39 +0200
Subject: [PATCH] Enable unexpected cfgs lint (#656)

Previously, the only way to configure this lint was using a build.rs
file, but now it can be done using Cargo.toml as well.
---
 curve25519-dalek/Cargo.toml                         | 10 ++++++++++
 curve25519-dalek/src/backend/vector/ifma/edwards.rs |  2 +-
 curve25519-dalek/src/backend/vector/ifma/field.rs   |  2 +-
 curve25519-dalek/src/lib.rs                         |  2 --
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/curve25519-dalek/Cargo.toml b/curve25519-dalek/Cargo.toml
index dc3b2b4..f0896ba 100644
--- a/curve25519-dalek/Cargo.toml
+++ b/curve25519-dalek/Cargo.toml
@@ -71,3 +71,13 @@ group-bits = ["group", "ff/bits"]
 
 [target.'cfg(all(not(curve25519_dalek_backend = "fiat"), not(curve25519_dalek_backend = "serial"), target_arch = "x86_64"))'.dependencies]
 curve25519-dalek-derive = { version = "0.1", path = "../curve25519-dalek-derive" }
+
+[lints.rust.unexpected_cfgs]
+level = "warn"
+check-cfg = [
+    'cfg(allow_unused_unsafe)',
+    'cfg(curve25519_dalek_backend, values("fiat", "serial", "simd"))',
+    'cfg(curve25519_dalek_diagnostics, values("build"))',
+    'cfg(curve25519_dalek_bits, values("32", "64"))',
+    'cfg(nightly)',
+]
diff --git a/curve25519-dalek/src/backend/vector/ifma/edwards.rs b/curve25519-dalek/src/backend/vector/ifma/edwards.rs
index f8605fe..3de7030 100644
--- a/curve25519-dalek/src/backend/vector/ifma/edwards.rs
+++ b/curve25519-dalek/src/backend/vector/ifma/edwards.rs
@@ -249,7 +249,7 @@ impl<'a> From<&'a edwards::EdwardsPoint> for NafLookupTable8<CachedPoint> {
     }
 }
 
-#[cfg(target_feature = "avx512ifma,avx512vl")]
+#[cfg(all(target_feature = "avx512ifma", target_feature = "avx512vl"))]
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/curve25519-dalek/src/backend/vector/ifma/field.rs b/curve25519-dalek/src/backend/vector/ifma/field.rs
index fa8ce2d..ebdfba1 100644
--- a/curve25519-dalek/src/backend/vector/ifma/field.rs
+++ b/curve25519-dalek/src/backend/vector/ifma/field.rs
@@ -629,7 +629,7 @@ impl<'a, 'b> Mul<&'b F51x4Reduced> for &'a F51x4Reduced {
     }
 }
 
-#[cfg(target_feature = "avx512ifma,avx512vl")]
+#[cfg(all(target_feature = "avx512ifma", target_feature = "avx512vl"))]
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/curve25519-dalek/src/lib.rs b/curve25519-dalek/src/lib.rs
index fecfe88..d866645 100644
--- a/curve25519-dalek/src/lib.rs
+++ b/curve25519-dalek/src/lib.rs
@@ -42,8 +42,6 @@
     unused_lifetimes,
     unused_qualifications
 )]
-// Requires MSRV 1.77 as it does not allow build.rs gating
-#![allow(unexpected_cfgs)]
 
 //------------------------------------------------------------------------
 // External dependencies: