Address nightly clippy::derivable_impls lints

ctz · djc · commit 6ed925e55ad9 · 2025-11-04T14:25:37.000Z
diff --git a/rustls/src/enums.rs b/rustls/src/enums.rs
@@ -615,7 +615,9 @@ enum_builder! {
     /// [RFC 6091 Section 5]: <https://datatracker.ietf.org/doc/html/rfc6091#section-5>
     /// [RFC 7250 Section 7]: <https://datatracker.ietf.org/doc/html/rfc7250#section-7>
     #[repr(u8)]
+    #[derive(Default)]
     pub enum CertificateType {
+        #[default]
         X509 => 0x00,
         RawPublicKey => 0x02,
     }
diff --git a/rustls/src/msgs/enums.rs b/rustls/src/msgs/enums.rs
@@ -355,27 +355,26 @@ enum_builder! {
     ///
     /// [RFC 9180 Section 7.2]: <https://datatracker.ietf.org/doc/html/rfc9180#name-key-derivation-functions-kd>
     #[repr(u16)]
+    #[derive(Default)]
     pub enum HpkeKdf {
+        // TODO(XXX): revisit the default configuration. This is just what Cloudflare ships right now.
+        #[default]
         HKDF_SHA256 => 0x0001,
         HKDF_SHA384 => 0x0002,
         HKDF_SHA512 => 0x0003,
     }
 }
 
-impl Default for HpkeKdf {
-    // TODO(XXX): revisit the default configuration. This is just what Cloudflare ships right now.
-    fn default() -> Self {
-        Self::HKDF_SHA256
-    }
-}
-
 enum_builder! {
     /// The Authenticated Encryption with Associated Data (`Aead`) type for HPKE operations.
     /// Listed by IANA, as specified in [RFC 9180 Section 7.3]
     ///
     /// [RFC 9180 Section 7.3]: <https://datatracker.ietf.org/doc/html/rfc9180#name-authenticated-encryption-wi>
     #[repr(u16)]
+    #[derive(Default)]
     pub enum HpkeAead {
+        // TODO(XXX): revisit the default configuration. This is just what Cloudflare ships right now.
+        #[default]
         AES_128_GCM => 0x0001,
         AES_256_GCM => 0x0002,
         CHACHA20_POLY_1305 => 0x0003,
@@ -396,13 +395,6 @@ impl HpkeAead {
     }
 }
 
-impl Default for HpkeAead {
-    // TODO(XXX): revisit the default configuration. This is just what Cloudflare ships right now.
-    fn default() -> Self {
-        Self::AES_128_GCM
-    }
-}
-
 enum_builder! {
     /// The Encrypted Client Hello protocol version (`EchVersion`).
     ///
diff --git a/rustls/src/quic.rs b/rustls/src/quic.rs
@@ -976,11 +976,12 @@ pub enum KeyChange {
 ///
 /// Governs version-specific behavior in the TLS layer
 #[non_exhaustive]
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, Default)]
 pub enum Version {
     /// Draft versions 29, 30, 31 and 32
     V1Draft,
     /// First stable RFC
+    #[default]
     V1,
     /// Anti-ossification variant of V1
     V2,
@@ -1039,12 +1040,6 @@ impl Version {
     }
 }
 
-impl Default for Version {
-    fn default() -> Self {
-        Self::V1
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use std::prelude::v1::*;
diff --git a/rustls/src/server/server_conn.rs b/rustls/src/server/server_conn.rs
@@ -1111,7 +1111,9 @@ impl State<ServerConnectionData> for Accepting {
     }
 }
 
+#[derive(Default)]
 pub(super) enum EarlyDataState {
+    #[default]
     New,
     Accepted {
         received: ChunkVecBuffer,
@@ -1120,12 +1122,6 @@ pub(super) enum EarlyDataState {
     Rejected,
 }
 
-impl Default for EarlyDataState {
-    fn default() -> Self {
-        Self::New
-    }
-}
-
 impl EarlyDataState {
     pub(super) fn reject(&mut self) {
         *self = Self::Rejected;
