Workaround the clippy::redundant_feature_names errors

AnimaGUS-minerva · Oct 18, 2024 · 7880cd9 · 7880cd9
1 parent f46c434
commit 7880cd9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/psa-crypto-sys/Cargo.toml b/psa-crypto-sys/Cargo.toml
@@ -51,7 +51,7 @@ mbedtls-time-workaround = []
 std = ["debug"] # deprecated automatic enabling of debug, can be removed on major version bump
 debug = []
 custom_printf = []
-custom_has_support = []
+custom_has = []
 aes_alt = []
 threading = []
 time = []

diff --git a/psa-crypto-sys/minerva/config.rs b/psa-crypto-sys/minerva/config.rs
@@ -372,8 +372,8 @@ pub const FEATURE_DEFINES: &[(&str, CDefine)] = &[
     ("custom_printf",         ("MBEDTLS_PLATFORM_PRINTF_MACRO",             DefinedAs("mbedtls_printf"))),
     ("aesni",                 ("MBEDTLS_AESNI_C",                           Defined)),
     ("padlock",               ("MBEDTLS_PADLOCK_C",                         Defined)),
-    ("custom_has_support",    ("MBEDTLS_CUSTOM_HAS_AESNI",                  Defined)),
-    ("custom_has_support",    ("MBEDTLS_CUSTOM_HAS_PADLOCK",                Defined)),
+    ("custom_has",            ("MBEDTLS_CUSTOM_HAS_AESNI",                  Defined)),
+    ("custom_has",            ("MBEDTLS_CUSTOM_HAS_PADLOCK",                Defined)),
     ("legacy_protocols",      ("MBEDTLS_SSL_PROTO_TLS1",                    Undefined)),
     ("legacy_protocols",      ("MBEDTLS_SSL_PROTO_TLS1_1",                  Undefined)),
     ("legacy_protocols",      ("MBEDTLS_SSL_CBC_RECORD_SPLITTING",          Defined)),

diff --git a/psa-crypto-sys/minerva/features.rs b/psa-crypto-sys/minerva/features.rs
@@ -24,7 +24,7 @@ lazy_static! {
 impl Features {
     fn init(&mut self) {
         if env_have_target_cfg("env", "sgx") {
-            self.automatic_features.insert("custom_has_support");
+            self.automatic_features.insert("custom_has");
             self.automatic_features.insert("aes_alt");
             self.automatic_features.insert("aesni");
         }