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));

librustls/tests/client_server.rs

@@ -8,7 +8,7 @@ const PORT: &str = "8443";
 #[test]
 #[ignore] // This test requires the client & server binaries be present.
 fn client_server_integration() {
-    let server_addr = format!("{}:{}", HOST, PORT);
+    let server_addr = format!("{HOST}:{PORT}");
     if TcpStream::connect(&server_addr).is_ok() {
         panic!("cannot run tests; something is already listening on {server_addr}");
     }

tools/src/bin/docgen/main.rs

@@ -139,7 +139,7 @@ fn find_doc_items(root: Node, source_code: &[u8]) -> Result<ApiDocs, Box<dyn Err
         }
     }
     if errors > 0 {
-        return Err(format!("{} errors produced while documenting header file", errors).into());
+        return Err(format!("{errors} errors produced while documenting header file").into());
     }
 
     let mut api = ApiDocs::default();

tools/src/bin/ech_fetch/main.rs

@@ -25,7 +25,7 @@ use rustls::pki_types::EchConfigListBytes;
 async fn main() -> Result<(), Box<dyn Error>> {
     let mut args = env::args().skip(1);
     let domain = args.next().unwrap_or("research.cloudflare.com".to_string());
-    let output_path = args.next().unwrap_or(format!("{}.ech.configs.bin", domain));
+    let output_path = args.next().unwrap_or(format!("{domain}.ech.configs.bin"));
 
     let resolver = Resolver::builder_with_config(
         ResolverConfig::google_https(),
@@ -48,7 +48,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
         }
         // And print a comma separated list of the file paths.
         let paths = (1..=all_lists.len())
-            .map(|i| format!("{}.{}", output_path, i))
+            .map(|i| format!("{output_path}.{i}"))
             .collect::<Vec<_>>()
             .join(",");
         println!("{paths}")