rustfmt: style_edition 2024

Author: ctz

rustfmt.toml

@@ -0,0 +1 @@
+style_edition = "2024"

src/lib.rs

@@ -327,7 +327,7 @@ impl PrivatePkcs1KeyDer<'_> {
 #[cfg(feature = "alloc")]
 impl zeroize::Zeroize for PrivatePkcs1KeyDer<'static> {
     fn zeroize(&mut self) {
-        self.0 .0.zeroize()
+        self.0.0.zeroize()
     }
 }
 
@@ -394,7 +394,7 @@ impl PrivateSec1KeyDer<'_> {
 #[cfg(feature = "alloc")]
 impl zeroize::Zeroize for PrivateSec1KeyDer<'static> {
     fn zeroize(&mut self) {
-        self.0 .0.zeroize()
+        self.0.0.zeroize()
     }
 }
 
@@ -462,7 +462,7 @@ impl PrivatePkcs8KeyDer<'_> {
 #[cfg(feature = "alloc")]
 impl zeroize::Zeroize for PrivatePkcs8KeyDer<'static> {
     fn zeroize(&mut self) {
-        self.0 .0.zeroize()
+        self.0.0.zeroize()
     }
 }
 
@@ -714,7 +714,7 @@ impl CertificateDer<'_> {
     /// Converts this certificate into its owned variant, unfreezing borrowed content (if any)
     #[cfg(feature = "alloc")]
     pub fn into_owned(self) -> CertificateDer<'static> {
-        CertificateDer(Der(self.0 .0.into_owned()))
+        CertificateDer(Der(self.0.0.into_owned()))
     }
 }
 
@@ -777,7 +777,7 @@ impl SubjectPublicKeyInfoDer<'_> {
     /// Converts this SubjectPublicKeyInfo into its owned variant, unfreezing borrowed content (if any)
     #[cfg(feature = "alloc")]
     pub fn into_owned(self) -> SubjectPublicKeyInfoDer<'static> {
-        SubjectPublicKeyInfoDer(Der(self.0 .0.into_owned()))
+        SubjectPublicKeyInfoDer(Der(self.0.0.into_owned()))
     }
 }
 

src/server_name.rs

@@ -335,14 +335,14 @@ const fn validate(input: &[u8]) -> Result<(), InvalidDnsNameError> {
         let ch = input[idx];
         state = match (state, ch) {
             (Start | Next | NextAfterNumericOnly | Hyphen { .. }, b'.') => {
-                return Err(InvalidDnsNameError)
+                return Err(InvalidDnsNameError);
             }
             (Subsequent { .. }, b'.') => Next,
             (NumericOnly { .. }, b'.') => NextAfterNumericOnly,
             (Subsequent { len } | NumericOnly { len } | Hyphen { len }, _)
                 if len >= MAX_LABEL_LENGTH =>
             {
-                return Err(InvalidDnsNameError)
+                return Err(InvalidDnsNameError);
             }
             (Start | Next | NextAfterNumericOnly, b'0'..=b'9') => NumericOnly { len: 1 },
             (NumericOnly { len }, b'0'..=b'9') => NumericOnly { len: len + 1 },
@@ -837,8 +837,14 @@ mod tests {
         ("a123b.com", true),
         ("numeric-only-middle-label.4.com", true),
         ("1000-sans.badssl.com", true),
-        ("twohundredandfiftythreecharacters.twohundredandfiftythreecharacters.twohundredandfiftythreecharacters.twohundredandfiftythreecharacters.twohundredandfiftythreecharacters.twohundredandfiftythreecharacters.twohundredandfiftythreecharacters.twohundredandfi", true),
-        ("twohundredandfiftyfourcharacters.twohundredandfiftyfourcharacters.twohundredandfiftyfourcharacters.twohundredandfiftyfourcharacters.twohundredandfiftyfourcharacters.twohundredandfiftyfourcharacters.twohundredandfiftyfourcharacters.twohundredandfiftyfourc", false),
+        (
+            "twohundredandfiftythreecharacters.twohundredandfiftythreecharacters.twohundredandfiftythreecharacters.twohundredandfiftythreecharacters.twohundredandfiftythreecharacters.twohundredandfiftythreecharacters.twohundredandfiftythreecharacters.twohundredandfi",
+            true,
+        ),
+        (
+            "twohundredandfiftyfourcharacters.twohundredandfiftyfourcharacters.twohundredandfiftyfourcharacters.twohundredandfiftyfourcharacters.twohundredandfiftyfourcharacters.twohundredandfiftyfourcharacters.twohundredandfiftyfourcharacters.twohundredandfiftyfourc",
+            false,
+        ),
     ];
 
     #[cfg(feature = "alloc")]

tests/pem.rs

@@ -4,9 +4,9 @@ use std::io::Cursor;
 
 use rustls_pki_types::pem::PemObject;
 use rustls_pki_types::{
-    pem, CertificateDer, CertificateRevocationListDer, CertificateSigningRequestDer,
-    EchConfigListBytes, PrivateKeyDer, PrivatePkcs1KeyDer, PrivatePkcs8KeyDer, PrivateSec1KeyDer,
-    SubjectPublicKeyInfoDer,
+    CertificateDer, CertificateRevocationListDer, CertificateSigningRequestDer, EchConfigListBytes,
+    PrivateKeyDer, PrivatePkcs1KeyDer, PrivatePkcs8KeyDer, PrivateSec1KeyDer,
+    SubjectPublicKeyInfoDer, pem,
 };
 
 #[test]