clippy

s0l0ist · s0l0ist · commit 0eb37b2a033c · 2025-07-10T07:02:17.000+02:00
diff --git a/examples/advanced-appconfig-feature-flags/src/main.rs b/examples/advanced-appconfig-feature-flags/src/main.rs
@@ -35,9 +35,9 @@ async fn function_handler<T: ConfigurationFetcher + Send + Sync>(
 
     // Use the feature flag
     let msg = if config.spanish_response {
-        format!("{}, in spanish.", quote)
+        format!("{quote}, in spanish.")
     } else {
-        format!("{}.", quote)
+        format!("{quote}.")
     };
 
     // Return `Response` (it will be serialized to JSON automatically by the runtime)
diff --git a/examples/advanced-sqs-partial-batch-failures/src/main.rs b/examples/advanced-sqs-partial-batch-failures/src/main.rs
@@ -55,7 +55,7 @@ where
     D: DeserializeOwned,
     R: Future<Output = Result<(), Error>>,
 {
-    run(service_fn(|e| batch_handler(|d| f(d), e))).await
+    run(service_fn(|e| batch_handler(&f, e))).await
 }
 
 /// Helper function to lift the user provided `f` function from message to batch of messages.
@@ -123,7 +123,7 @@ mod test {
     }
 
     #[tokio::test]
-    async fn test() -> () {
+    async fn test() {
         let msg_to_fail: SqsMessageObj<serde_json::Value> = serde_json::from_str(
             r#"{
                 "messageId": "1",
diff --git a/examples/basic-error-handling/src/main.rs b/examples/basic-error-handling/src/main.rs
@@ -43,7 +43,7 @@ impl std::fmt::Display for CustomError {
     /// Display the error struct as a JSON string
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let err_as_json = json!(self).to_string();
-        write!(f, "{}", err_as_json)
+        write!(f, "{err_as_json}")
     }
 }
 
@@ -66,7 +66,7 @@ pub(crate) async fn func(event: LambdaEvent<Request>) -> Result<Response, Error>
     match event.event_type {
         EventType::SimpleError => {
             // generate a simple text message error using `simple_error` crate
-            return Err(Box::new(simple_error::SimpleError::new("A simple error as requested!")));
+            Err(Box::new(simple_error::SimpleError::new("A simple error as requested!")))
         }
         EventType::CustomError => {
             // generate a custom error using our own structure
@@ -75,7 +75,7 @@ pub(crate) async fn func(event: LambdaEvent<Request>) -> Result<Response, Error>
                 req_id: ctx.request_id,
                 msg: "A custom error as requested!".into(),
             };
-            return Err(Box::new(cust_err));
+            Err(Box::new(cust_err))
         }
         EventType::ExternalError => {
             // try to open a non-existent file to get an error and propagate it with `?`
@@ -94,7 +94,7 @@ pub(crate) async fn func(event: LambdaEvent<Request>) -> Result<Response, Error>
                 msg: "OK".into(),
             };
 
-            return Ok(resp);
+            Ok(resp)
         }
     }
 }
diff --git a/examples/basic-error-thiserror/src/main.rs b/examples/basic-error-thiserror/src/main.rs
@@ -1,6 +1,5 @@
 use lambda_runtime::{service_fn, Diagnostic, Error, LambdaEvent};
 use serde::Deserialize;
-use thiserror;
 
 #[derive(Deserialize)]
 struct Request {}
@@ -21,7 +20,7 @@ impl From<ExecutionError> for Diagnostic {
         };
         Diagnostic {
             error_type: error_type.into(),
-            error_message: error_message.into(),
+            error_message,
         }
     }
 }
diff --git a/examples/basic-lambda-external-runtime/src/main.rs b/examples/basic-lambda-external-runtime/src/main.rs
@@ -53,7 +53,7 @@ fn main() -> Result<(), io::Error> {
     my_runtime(move || future::block_on(app_runtime_task(lambda_rx.clone(), shutdown_tx.clone())));
 
     // Block the main thread until a shutdown signal is received.
-    future::block_on(shutdown_rx.recv()).map_err(|err| io::Error::new(io::ErrorKind::Other, format!("{:?}", err)))
+    future::block_on(shutdown_rx.recv()).map_err(|err| io::Error::other(format!("{err:?}")))
 }
 
 pub(crate) async fn my_handler(event: LambdaEvent<Request>) -> Result<Response, Error> {
@@ -63,7 +63,7 @@ pub(crate) async fn my_handler(event: LambdaEvent<Request>) -> Result<Response,
     // prepare the response
     let resp = Response {
         req_id: event.context.request_id,
-        msg: format!("Command {} executed.", command),
+        msg: format!("Command {command} executed."),
     };
 
     // return `Response` (it will be serialized to JSON automatically by the runtime)
diff --git a/examples/basic-lambda/src/main.rs b/examples/basic-lambda/src/main.rs
@@ -39,7 +39,7 @@ pub(crate) async fn my_handler(event: LambdaEvent<Request>) -> Result<Response,
     // prepare the response
     let resp = Response {
         req_id: event.context.request_id,
-        msg: format!("Command {} executed.", command),
+        msg: format!("Command {command} executed."),
     };
 
     // return `Response` (it will be serialized to JSON automatically by the runtime)
diff --git a/examples/basic-s3-object-lambda-thumbnail/src/main.rs b/examples/basic-s3-object-lambda-thumbnail/src/main.rs
@@ -114,7 +114,7 @@ mod tests {
 
         mock.expect_send_file()
             .withf(|r, t, by| {
-                return r.eq("O_ROUTE") && t.eq("O_TOKEN") && by == "THUMBNAIL".as_bytes();
+                r.eq("O_ROUTE") && t.eq("O_TOKEN") && by == "THUMBNAIL".as_bytes()
             })
             .returning(|_1, _2, _3| Ok("File sent.".to_string()));
 
@@ -128,7 +128,7 @@ mod tests {
     }
 
     fn get_s3_event() -> S3ObjectLambdaEvent {
-        return S3ObjectLambdaEvent {
+        S3ObjectLambdaEvent {
             x_amz_request_id: ("ID".to_string()),
             head_object_context: (Some(HeadObjectContext::default())),
             list_objects_context: (Some(ListObjectsContext::default())),
@@ -146,6 +146,6 @@ mod tests {
                 supporting_access_point_arn: ("SAPRN".to_string()),
                 payload: (json!(null)),
             }),
-        };
+        }
     }
 }
diff --git a/examples/basic-s3-thumbnail/src/main.rs b/examples/basic-s3-thumbnail/src/main.rs
@@ -174,22 +174,22 @@ mod tests {
 
         mock.expect_put_file()
             .withf(|bu, ke, by| {
-                return bu.eq("test-bucket-thumbs") && ke.eq(key) && by.eq("THUMBNAIL".as_bytes());
+                bu.eq("test-bucket-thumbs") && ke.eq(key) && by.eq("THUMBNAIL".as_bytes())
             })
             .return_const(Ok("Done".to_string()));
 
         let payload = get_s3_event("ObjectCreated", bucket, key);
         let event = LambdaEvent { payload, context };
 
-        let result = function_handler(event, 10, &mock).await.unwrap();
+        function_handler(event, 10, &mock).await.unwrap();
 
-        assert_eq!((), result);
+        assert_eq!((), ());
     }
 
     fn get_s3_event(event_name: &str, bucket_name: &str, object_key: &str) -> S3Event {
-        return S3Event {
+        S3Event {
             records: (vec![get_s3_event_record(event_name, bucket_name, object_key)]),
-        };
+        }
     }
 
     fn get_s3_event_record(event_name: &str, bucket_name: &str, object_key: &str) -> S3EventRecord {
@@ -213,7 +213,7 @@ mod tests {
             }),
         };
 
-        return S3EventRecord {
+        S3EventRecord {
             event_version: (Some(String::default())),
             event_source: (Some(String::default())),
             aws_region: (Some(String::default())),
@@ -227,6 +227,6 @@ mod tests {
             }),
             response_elements: (HashMap::new()),
             s3: (s3_entity),
-        };
+        }
     }
 }
diff --git a/examples/basic-s3-thumbnail/src/s3.rs b/examples/basic-s3-thumbnail/src/s3.rs
@@ -43,7 +43,7 @@ impl PutFile for S3Client {
         let result = self.put_object().bucket(bucket).key(key).body(bytes).send().await;
 
         match result {
-            Ok(_) => Ok(format!("Uploaded a file with key {} into {}", key, bucket)),
+            Ok(_) => Ok(format!("Uploaded a file with key {key} into {bucket}")),
             Err(err) => Err(err.into_service_error().meta().message().unwrap().to_string()),
         }
     }
diff --git a/examples/basic-sdk/src/main.rs b/examples/basic-sdk/src/main.rs
@@ -52,7 +52,7 @@ async fn my_handler<T: ListObjects>(event: LambdaEvent<Request>, client: &T) ->
     let objects_rsp = client.list_objects(&bucket).await?;
     let objects: Vec<_> = objects_rsp
         .contents()
-        .into_iter()
+        .iter()
         .filter_map(|o| o.key().map(|k| k.to_string()))
         .collect();
 
diff --git a/examples/basic-streaming-response/src/main.rs b/examples/basic-streaming-response/src/main.rs
@@ -7,7 +7,7 @@ use serde_json::Value;
 use std::{thread, time::Duration};
 
 async fn func(_event: LambdaEvent<Value>) -> Result<Response<Body>, Error> {
-    let messages = vec!["Hello", "world", "from", "Lambda!"];
+    let messages = ["Hello", "world", "from", "Lambda!"];
 
     let (mut tx, rx) = channel();
 
diff --git a/examples/http-cors/src/main.rs b/examples/http-cors/src/main.rs
@@ -28,7 +28,7 @@ async fn func(event: Request) -> Result<Response<Body>, Error> {
             .query_string_parameters_ref()
             .and_then(|params| params.first("first_name"))
         {
-            Some(first_name) => format!("Hello, {}!", first_name).into_response().await,
+            Some(first_name) => format!("Hello, {first_name}!").into_response().await,
             None => Response::builder()
                 .status(400)
                 .body("Empty first name".into())
diff --git a/examples/http-query-parameters/src/main.rs b/examples/http-query-parameters/src/main.rs
@@ -11,7 +11,7 @@ async fn function_handler(event: Request) -> Result<impl IntoResponse, Error> {
             .query_string_parameters_ref()
             .and_then(|params| params.first("first_name"))
         {
-            Some(first_name) => format!("Hello, {}!", first_name).into_response().await,
+            Some(first_name) => format!("Hello, {first_name}!").into_response().await,
             None => Response::builder()
                 .status(400)
                 .body("Empty first name".into())
diff --git a/examples/lambda-rds-iam-auth/src/main.rs b/examples/lambda-rds-iam-auth/src/main.rs
@@ -39,10 +39,7 @@ async fn generate_rds_iam_token(db_hostname: &str, port: u16, db_username: &str)
         .build()?;
 
     let url = format!(
-        "https://{db_hostname}:{port}/?Action=connect&DBUser={db_user}",
-        db_hostname = db_hostname,
-        port = port,
-        db_user = db_username
+        "https://{db_hostname}:{port}/?Action=connect&DBUser={db_username}"
     );
 
     let signable_request =
@@ -52,7 +49,7 @@ async fn generate_rds_iam_token(db_hostname: &str, port: u16, db_username: &str)
 
     let mut url = url::Url::parse(&url).unwrap();
     for (name, value) in signing_instructions.params() {
-        url.query_pairs_mut().append_pair(name, &value);
+        url.query_pairs_mut().append_pair(name, value);
     }
 
     let response = url.to_string().split_off("https://".len());
@@ -93,7 +90,7 @@ async fn handler(_event: LambdaEvent<Value>) -> Result<Value, Error> {
         .fetch_one(&pool)
         .await?;
 
-    println!("Result: {:?}", result);
+    println!("Result: {result:?}");
 
     Ok(json!({
         "statusCode": 200,

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ where`
`55`	`55`	`D: DeserializeOwned,`
`56`	`56`	`R: Future<Output = Result<(), Error>>,`
`57`	`57`	`{`
`58`		`- run(service_fn(\|e\| batch_handler(\|d\| f(d), e))).await`
	`58`	`+ run(service_fn(\|e\| batch_handler(&f, e))).await`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	/// Helper function to lift the user provided `f` function from message to batch of messages.
`@@ -123,7 +123,7 @@ mod test {`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`#[tokio::test]`
`126`		`- async fn test() -> () {`
	`126`	`+ async fn test() {`
`127`	`127`	`let msg_to_fail: SqsMessageObj<serde_json::Value> = serde_json::from_str(`
`128`	`128`	`r#"{`
`129`	`129`	`"messageId": "1",`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ impl std::fmt::Display for CustomError {`
`43`	`43`	`/// Display the error struct as a JSON string`
`44`	`44`	`fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {`
`45`	`45`	`let err_as_json = json!(self).to_string();`
`46`		`- write!(f, "{}", err_as_json)`
	`46`	`+ write!(f, "{err_as_json}")`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`@@ -66,7 +66,7 @@ pub(crate) async fn func(event: LambdaEvent<Request>) -> Result<Response, Error>`
`66`	`66`	`match event.event_type {`
`67`	`67`	`EventType::SimpleError => {`
`68`	`68`	// generate a simple text message error using `simple_error` crate
`69`		`- return Err(Box::new(simple_error::SimpleError::new("A simple error as requested!")));`
	`69`	`+ Err(Box::new(simple_error::SimpleError::new("A simple error as requested!")))`
`70`	`70`	`}`
`71`	`71`	`EventType::CustomError => {`
`72`	`72`	`// generate a custom error using our own structure`
`@@ -75,7 +75,7 @@ pub(crate) async fn func(event: LambdaEvent<Request>) -> Result<Response, Error>`
`75`	`75`	`req_id: ctx.request_id,`
`76`	`76`	`msg: "A custom error as requested!".into(),`
`77`	`77`	`};`
`78`		`- return Err(Box::new(cust_err));`
	`78`	`+ Err(Box::new(cust_err))`
`79`	`79`	`}`
`80`	`80`	`EventType::ExternalError => {`
`81`	`81`	// try to open a non-existent file to get an error and propagate it with `?`
`@@ -94,7 +94,7 @@ pub(crate) async fn func(event: LambdaEvent<Request>) -> Result<Response, Error>`
`94`	`94`	`msg: "OK".into(),`
`95`	`95`	`};`
`96`	`96`
`97`		`- return Ok(resp);`
	`97`	`+ Ok(resp)`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`use lambda_runtime::{service_fn, Diagnostic, Error, LambdaEvent};`
`2`	`2`	`use serde::Deserialize;`
`3`		`-use thiserror;`
`4`	`3`
`5`	`4`	`#[derive(Deserialize)]`
`6`	`5`	`struct Request {}`
`@@ -21,7 +20,7 @@ impl From<ExecutionError> for Diagnostic {`
`21`	`20`	`};`
`22`	`21`	`Diagnostic {`
`23`	`22`	`error_type: error_type.into(),`
`24`		`- error_message: error_message.into(),`
	`23`	`+ error_message,`
`25`	`24`	`}`
`26`	`25`	`}`
`27`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ impl PutFile for S3Client {`
`43`	`43`	`let result = self.put_object().bucket(bucket).key(key).body(bytes).send().await;`
`44`	`44`
`45`	`45`	`match result {`
`46`		`- Ok(_) => Ok(format!("Uploaded a file with key {} into {}", key, bucket)),`
	`46`	`+ Ok(_) => Ok(format!("Uploaded a file with key {key} into {bucket}")),`
`47`	`47`	`Err(err) => Err(err.into_service_error().meta().message().unwrap().to_string()),`
`48`	`48`	`}`
`49`	`49`	`}`