Merge pull request #315 from semiotic-ai/suchapalaver/clippy-fixes-for-rust-1.88

refactor(clippy): fix updated warnings for rust 1.88

Author: suchapalaver

tap_aggregator/build.rs

@@ -4,7 +4,7 @@
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("Running build.rs...");
     let out_dir = std::env::var("OUT_DIR").expect("OUT_DIR not set by Cargo");
-    println!("OUT_DIR: {}", out_dir); // This should print the output directory
+    println!("OUT_DIR: {out_dir}"); // This should print the output directory
 
     tonic_build::configure().compile_protos(
         &[

tap_aggregator/src/main.rs

@@ -88,7 +88,7 @@ async fn main() -> Result<()> {
     tracing_subscriber::fmt::init();
 
     let args = Args::parse();
-    debug!("Settings: {:?}", args);
+    debug!("Settings: {args:?}");
 
     // Start the metrics server.
     // We just let it gracelessly get killed at the end of main()

tap_aggregator/src/metrics.rs

@@ -20,7 +20,7 @@ async fn handler_metrics() -> (StatusCode, String) {
             error!("Error encoding metrics: {}", e);
             (
                 StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Error encoding metrics: {}", e),
+                format!("Error encoding metrics: {e}"),
             )
         }
     }
@@ -41,14 +41,14 @@ async fn _run_server(port: u16) {
 
     let server = serve(listener, app.into_make_service());
 
-    info!("Metrics server listening on {}", addr);
+    info!("Metrics server listening on {addr}");
 
     let res = server.await;
 
     debug!("Metrics server stopped");
 
     if let Err(err) = res {
-        panic!("Metrics server error: {:#?}", err);
+        panic!("Metrics server error: {err:#?}");
     };
 }
 

tap_aggregator/src/server.rs

@@ -110,7 +110,7 @@ fn parse_api_version(api_version: &str) -> Result<TapRpcApiVersion, JsonRpcError
     TapRpcApiVersion::from_str(api_version).map_err(|_| {
         jsonrpsee::types::ErrorObject::owned(
             JsonRpcErrorCode::InvalidVersion as i32,
-            format!("Unsupported API version: \"{}\".", api_version),
+            format!("Unsupported API version: \"{api_version}\"."),
             Some(tap_rpc_api_versions_info()),
         )
     })
@@ -123,9 +123,8 @@ fn check_api_version_deprecation(api_version: &TapRpcApiVersion) -> Option<JsonR
         Some(JsonRpcWarning::new(
             JsonRpcWarningCode::DeprecatedVersion as i32,
             format!(
-                "The API version {} will be deprecated. \
-                Please check https://github.com/semiotic-ai/timeline_aggregation_protocol for more information.",
-                api_version
+                "The API version {api_version} will be deprecated. \
+                Please check https://github.com/semiotic-ai/timeline_aggregation_protocol for more information."
             ),
             Some(tap_rpc_api_versions_info()),
         ))
@@ -405,7 +404,7 @@ pub async fn run_server(
     );
 
     // Create a `TcpListener` using tokio.
-    let listener = TcpListener::bind(&format!("0.0.0.0:{}", port))
+    let listener = TcpListener::bind(&format!("0.0.0.0:{port}"))
         .await
         .expect("Failed to bind to tap-aggregator port");
 

tap_core/src/manager/tap_manager.rs

@@ -85,7 +85,7 @@ impl<E, Rcpt> Manager<E, Rcpt> {
         if signed_rav.message != expected_rav {
             return Err(Error::InvalidReceivedRav {
                 received_rav: format!("{:?}", signed_rav.message),
-                expected_rav: format!("{:?}", expected_rav),
+                expected_rav: format!("{expected_rav:?}"),
             });
         }
 

tap_integration_tests/tests/indexer_mock.rs

@@ -166,10 +166,10 @@ where
     let server_config = ServerConfig::builder().http_only().build();
     let server = ServerBuilder::new()
         .set_config(server_config)
-        .build(format!("127.0.0.1:{}", port))
+        .build(format!("127.0.0.1:{port}"))
         .await?;
     let addr = server.local_addr()?;
-    println!("Listening on: {}", addr);
+    println!("Listening on: {addr}");
     let rpc_manager = RpcManager::new(
         domain_separator,
         context,
@@ -232,5 +232,5 @@ where
 }
 
 fn to_rpc_error(e: Box<dyn std::error::Error>, msg: &str) -> jsonrpsee::types::ErrorObjectOwned {
-    jsonrpsee::types::ErrorObject::owned(-32000, format!("{} - {}", e, msg), None::<()>)
+    jsonrpsee::types::ErrorObject::owned(-32000, format!("{e} - {msg}"), None::<()>)
 }

tap_integration_tests/tests/showcase.rs

@@ -503,7 +503,7 @@ async fn test_manager_one_indexer(
 
         match result {
             Ok(()) => {}
-            Err(e) => panic!("Error making receipt request: {:?}", e),
+            Err(e) => panic!("Error making receipt request: {e:?}"),
         }
     }
 
@@ -546,7 +546,7 @@ async fn test_manager_two_indexers(
         let future_2 = client_2.request("request", (receipt_2,));
         match tokio::try_join!(future_1, future_2) {
             Ok(((), ())) => {}
-            Err(e) => panic!("Error making receipt request: {:?}", e),
+            Err(e) => panic!("Error making receipt request: {e:?}"),
         }
     }
     Ok(())
@@ -681,7 +681,7 @@ async fn test_tap_manager_rav_timestamp_cuttoff(
         let result = client_2.request("request", (receipt_1,)).await;
         match result {
             Ok(()) => {}
-            Err(e) => panic!("Error making receipt request: {:?}", e),
+            Err(e) => panic!("Error making receipt request: {e:?}"),
         }
     }
     Ok(())
@@ -708,7 +708,7 @@ async fn test_tap_aggregator_rav_timestamp_cuttoff(
         http_max_concurrent_connections,
     )
     .await?;
-    let client = HttpClientBuilder::default().build(format!("http://{}", sender_addr))?;
+    let client = HttpClientBuilder::default().build(format!("http://{sender_addr}"))?;
 
     // This is the first part of the test, two batches of receipts are sent to the aggregator.
     // The second batch has one receipt with the same timestamp as the latest receipt in the first batch.