Apply nightly clippy suggestions

Author: djc

librustls/build.rs

@@ -32,8 +32,7 @@ fn main() {
     let pkg_version = env!("CARGO_PKG_VERSION");
     writeln!(
         &mut f,
-        r#"const RUSTLS_FFI_VERSION: &str = "rustls-ffi/{}/rustls/{}/{}";"#,
-        pkg_version, RUSTLS_CRATE_VERSION, rustls_crypto_provider
+        r#"const RUSTLS_FFI_VERSION: &str = "rustls-ffi/{pkg_version}/rustls/{RUSTLS_CRATE_VERSION}/{rustls_crypto_provider}";"#,
     )
     .expect("Could not write file");
 

librustls/src/cipher.rs

@@ -77,7 +77,7 @@ mod tests {
             let name = rustls_supported_ciphersuite_get_name(suite);
             let name = unsafe { name.to_str() };
             let proto = rustls_supported_ciphersuite_protocol_version(suite);
-            println!("{}: {} {:?}", i, name, proto);
+            println!("{i}: {name} {proto:?}");
         }
     }
 }

librustls/src/client.rs

@@ -859,7 +859,7 @@ mod tests {
             &mut conn,
         );
         if !matches!(result, rustls_result::Ok) {
-            panic!("expected RUSTLS_RESULT_OK, got {:?}", result);
+            panic!("expected RUSTLS_RESULT_OK, got {result:?}");
         }
         assert!(!rustls_connection::rustls_connection_wants_read(conn));
         assert!(rustls_connection::rustls_connection_wants_write(conn));
@@ -919,7 +919,7 @@ mod tests {
             &mut conn,
         );
         if !matches!(result, rustls_result::Ok) {
-            panic!("expected RUSTLS_RESULT_OK, got {:?}", result);
+            panic!("expected RUSTLS_RESULT_OK, got {result:?}");
         }
         rustls_server_cert_verifier::rustls_server_cert_verifier_free(verifier);
     }

librustls/src/rslice.rs

@@ -267,10 +267,7 @@ mod tests {
     fn test_rustls_str_debug() {
         let s = "abcd";
         let rs: rustls_str = s.try_into().unwrap();
-        assert_eq!(
-            format!("{:?}", rs),
-            r#"rustls_str { data: "abcd", len: 4 }"#
-        );
+        assert_eq!(format!("{rs:?}"), r#"rustls_str { data: "abcd", len: 4 }"#);
     }
 }
 

librustls/src/server.rs

@@ -777,10 +777,7 @@ mod tests {
             &mut certified_key,
         );
         if !matches!(result, rustls_result::Ok) {
-            panic!(
-                "expected RUSTLS_RESULT_OK from rustls_certified_key_build, got {:?}",
-                result
-            );
+            panic!("expected RUSTLS_RESULT_OK from rustls_certified_key_build, got {result:?}");
         }
         rustls_server_config_builder::rustls_server_config_builder_set_certified_keys(
             builder,
@@ -827,10 +824,7 @@ mod tests {
             &mut certified_key,
         );
         if !matches!(result, rustls_result::Ok) {
-            panic!(
-                "expected RUSTLS_RESULT_OK from rustls_certified_key_build, got {:?}",
-                result
-            );
+            panic!("expected RUSTLS_RESULT_OK from rustls_certified_key_build, got {result:?}");
         }
         rustls_server_config_builder::rustls_server_config_builder_set_certified_keys(
             builder,
@@ -847,7 +841,7 @@ mod tests {
         let mut conn = null_mut();
         let result = rustls_server_config::rustls_server_connection_new(config, &mut conn);
         if !matches!(result, rustls_result::Ok) {
-            panic!("expected RUSTLS_RESULT_OK, got {:?}", result);
+            panic!("expected RUSTLS_RESULT_OK, got {result:?}");
         }
         assert!(rustls_connection::rustls_connection_wants_read(conn));
         assert!(!rustls_connection::rustls_connection_wants_write(conn));