chore: apply clippy and fmt fixes (#5386)

Co-authored-by: Boquan Fang <bqfang@amazon.com>

Author: boquan-fang

bindings/rust/extended/s2n-tls-sys/build.rs

@@ -23,7 +23,7 @@ fn env<N: AsRef<str>>(name: N) -> String {
 
 fn option_env<N: AsRef<str>>(name: N) -> Option<String> {
     let name = name.as_ref();
-    println!("cargo:rerun-if-env-changed={}", name);
+    println!("cargo:rerun-if-env-changed={name}");
     std::env::var(name).ok()
 }
 
@@ -206,7 +206,7 @@ impl Default for Libcrypto {
                 if let Some(version) = version.strip_suffix("_INCLUDE") {
                     let version = version.to_string();
 
-                    println!("cargo:rerun-if-env-changed={}", name);
+                    println!("cargo:rerun-if-env-changed={name}");
 
                     let include = value;
                     let root = env(format!("DEP_AWS_LC_{version}_ROOT"));

bindings/rust/extended/s2n-tls-sys/tests/s2n_init.rs

@@ -14,7 +14,7 @@ fn s2n_init_test() {
             let error = *s2n_errno_location();
             let msg = s2n_strerror_name(error);
             let msg = std::ffi::CStr::from_ptr(msg);
-            panic!("s2n did not initialize correctly: {:?}", msg);
+            panic!("s2n did not initialize correctly: {msg:?}");
         }
     }
 }

bindings/rust/extended/s2n-tls-tokio/tests/common/mod.rs

@@ -38,7 +38,7 @@ pub static TEST_STR: &str = "hello world";
 
 pub async fn get_streams() -> Result<(TcpStream, TcpStream), tokio::io::Error> {
     let localhost = "127.0.0.1".to_owned();
-    let listener = TcpListener::bind(format!("{}:0", localhost)).await?;
+    let listener = TcpListener::bind(format!("{localhost}:0")).await?;
     let addr = listener.local_addr()?;
     let client_stream = TcpStream::connect(&addr).await?;
     let (server_stream, _) = listener.accept().await?;

bindings/rust/extended/s2n-tls/src/error.rs

@@ -475,9 +475,9 @@ mod tests {
             let app_error = error.application_error().unwrap();
             let _custom_error = app_error.downcast_ref::<CustomError>().unwrap();
 
-            let display = format!("{}", error);
+            let display = format!("{error}");
             assert_eq!(display, "custom error");
-            let debug = format!("{:?}", error);
+            let debug = format!("{error:?}");
             assert_eq!(debug, "CustomError");
         }
 

bindings/rust/extended/s2n-tls/src/testing.rs

@@ -124,7 +124,7 @@ impl CertKeyPair {
     /// ```
     pub fn from_path(prefix: &str, chain: &str, key: &str, ca: &str) -> Self {
         let cert_path = format!("{}{prefix}{chain}.pem", Self::TEST_PEMS_PATH);
-        println!("{:?}", cert_path);
+        println!("{cert_path:?}");
         let key_path = format!("{}{prefix}{key}.pem", Self::TEST_PEMS_PATH);
         let ca_path = format!("{}{prefix}{ca}.pem", Self::TEST_PEMS_PATH);
         let cert = std::fs::read(&cert_path)

tests/pcap/build.rs

@@ -75,10 +75,7 @@ fn add_github_urls(
     assert!(hex::decode(commit).is_ok());
 
     for file in files {
-        let url = format!(
-            "https://raw.githubusercontent.com/{}/{}/{}/{}",
-            repo, commit, path, file
-        );
+        let url = format!("https://raw.githubusercontent.com/{repo}/{commit}/{path}/{file}");
         let name = format!("{}_{}", repo.replace('/', "_"), file);
         if output.insert(name, url).is_some() {
             panic!("Duplicate download path for {repo}:{file}")
@@ -115,11 +112,9 @@ fn assert_tshark_version() -> Result<()> {
     let min_version = Version::new(4, 2, 0);
     assert!(
         version >= &min_version,
-        "tshark {} required. tshark {} found.",
-        min_version,
-        version
+        "tshark {min_version} required. tshark {version} found."
     );
-    println!("tshark version: {}", version);
+    println!("tshark version: {version}");
     Ok(())
 }
 

tests/pcap/src/handshake_message.rs

@@ -120,7 +120,7 @@ impl HandshakeMessage {
     fn from_packet(packet: Packet, tcp_packets: &HashMap<PacketId, Packet>) -> Result<Self> {
         let packet_id = packet.id();
         Self::parse_fields(packet, tcp_packets)
-            .with_context(|| format!("Failed to parse frame {}", packet_id))
+            .with_context(|| format!("Failed to parse frame {packet_id}"))
     }
 
     pub fn builder() -> Builder {

tests/pcap/src/lib.rs

@@ -39,7 +39,7 @@ mod tests {
         println!("All pcaps: ");
         let paths: HashSet<String> = pcaps
             .map(|file_str| {
-                println!("{}", file_str);
+                println!("{file_str}");
                 let (path, _file) = file_str.rsplit_once("/").expect("No path");
                 path.to_owned()
             })

tests/pcap/tests/s2n_client_hellos.rs

@@ -11,7 +11,7 @@ use s2n_tls::fingerprint;
 fn get_s2n_hello(pcap_hello: &PcapHello) -> Result<Box<S2NHello>> {
     let bytes = pcap_hello.message().bytes();
     let r = S2NHello::parse_client_hello(&bytes);
-    println!("Result: {:?}", r);
+    println!("Result: {r:?}");
     Ok(r?)
 }