Skip to content

Commit 42489f8

Browse files
bnusunnybnusunny
authored
Fix clippy warnings (#603)
1 parent 26b330d commit 42489f8

File tree

5 files changed

+25
-57
lines changed

5 files changed

+25
-57
lines changed

‎lambda-http/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ mod test_adapter {
221221

222222
fn call(&mut self, event: LambdaEvent<LambdaRequest>) -> Self::Future {
223223
// Log the request
224-
println!("Lambda event: {:#?}", event);
224+
println!("Lambda event: {event:#?}");
225225

226226
self.inner.call(event)
227227
}

‎lambda-http/src/request.rs

Lines changed: 20 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ mod tests {
456456
// https://docs.aws.amazon.com/lambda/latest/dg/eventsources.html#eventsources-api-gateway-request
457457
// note: file paths are relative to the directory of the crate at runtime
458458
let result = from_reader(File::open("tests/data/apigw_proxy_request.json").expect("expected file"));
459-
assert!(result.is_ok(), "event was not parsed as expected {:?}", result);
459+
assert!(result.is_ok(), "event was not parsed as expected {result:?}");
460460
}
461461

462462
#[test]
@@ -467,9 +467,7 @@ mod tests {
467467
let result = from_str(input);
468468
assert!(
469469
result.is_ok(),
470-
"event was not parsed as expected {:?} given {}",
471-
result,
472-
input
470+
"event was not parsed as expected {result:?} given {input}"
473471
);
474472
let req = result.expect("failed to parse request");
475473
assert_eq!(req.method(), "GET");
@@ -479,8 +477,7 @@ mod tests {
479477
let req_context = req.request_context();
480478
assert!(
481479
matches!(req_context, RequestContext::ApiGatewayV2(_)),
482-
"expected ApiGatewayV2 context, got {:?}",
483-
req_context
480+
"expected ApiGatewayV2 context, got {req_context:?}"
484481
);
485482
}
486483

@@ -492,9 +489,7 @@ mod tests {
492489
let result = from_str(input);
493490
assert!(
494491
result.is_ok(),
495-
"event was not parsed as expected {:?} given {}",
496-
result,
497-
input
492+
"event was not parsed as expected {result:?} given {input}"
498493
);
499494
let req = result.expect("failed to parse request");
500495
let cookie_header = req
@@ -511,8 +506,7 @@ mod tests {
511506
let req_context = req.request_context();
512507
assert!(
513508
matches!(req_context, RequestContext::ApiGatewayV2(_)),
514-
"expected ApiGatewayV2 context, got {:?}",
515-
req_context
509+
"expected ApiGatewayV2 context, got {req_context:?}"
516510
);
517511
}
518512

@@ -525,9 +519,7 @@ mod tests {
525519
let result = from_str(input);
526520
assert!(
527521
result.is_ok(),
528-
"event was not parsed as expected {:?} given {}",
529-
result,
530-
input
522+
"event was not parsed as expected {result:?} given {input}"
531523
);
532524
let req = result.expect("failed to parse request");
533525
assert_eq!(req.method(), "GET");
@@ -540,8 +532,7 @@ mod tests {
540532
let req_context = req.request_context();
541533
assert!(
542534
matches!(req_context, RequestContext::ApiGatewayV1(_)),
543-
"expected ApiGateway context, got {:?}",
544-
req_context
535+
"expected ApiGateway context, got {req_context:?}"
545536
);
546537
}
547538

@@ -553,9 +544,7 @@ mod tests {
553544
let result = from_str(input);
554545
assert!(
555546
result.is_ok(),
556-
"event was not parsed as expected {:?} given {}",
557-
result,
558-
input
547+
"event was not parsed as expected {result:?} given {input}"
559548
);
560549
let req = result.expect("failed to parse request");
561550
let cookie_header = req
@@ -576,8 +565,7 @@ mod tests {
576565
let req_context = req.request_context();
577566
assert!(
578567
matches!(req_context, RequestContext::ApiGatewayV2(_)),
579-
"expected ApiGatewayV2 context, got {:?}",
580-
req_context
568+
"expected ApiGatewayV2 context, got {req_context:?}"
581569
);
582570
}
583571

@@ -589,9 +577,7 @@ mod tests {
589577
let result = from_str(input);
590578
assert!(
591579
result.is_ok(),
592-
"event was not parsed as expected {:?} given {}",
593-
result,
594-
input
580+
"event was not parsed as expected {result:?} given {input}"
595581
);
596582
let req = result.expect("failed to parse request");
597583
assert_eq!(req.method(), "GET");
@@ -604,8 +590,7 @@ mod tests {
604590
let req_context = req.request_context();
605591
assert!(
606592
matches!(req_context, RequestContext::Alb(_)),
607-
"expected Alb context, got {:?}",
608-
req_context
593+
"expected Alb context, got {req_context:?}"
609594
);
610595
}
611596

@@ -617,9 +602,7 @@ mod tests {
617602
let result = from_str(input);
618603
assert!(
619604
result.is_ok(),
620-
"event was not parsed as expected {:?} given {}",
621-
result,
622-
input
605+
"event was not parsed as expected {result:?} given {input}"
623606
);
624607
let req = result.expect("failed to parse request");
625608
assert_eq!(req.method(), "GET");
@@ -632,8 +615,7 @@ mod tests {
632615
let req_context = req.request_context();
633616
assert!(
634617
matches!(req_context, RequestContext::Alb(_)),
635-
"expected Alb context, got {:?}",
636-
req_context
618+
"expected Alb context, got {req_context:?}"
637619
);
638620
}
639621

@@ -645,9 +627,7 @@ mod tests {
645627
let result = from_str(input);
646628
assert!(
647629
result.is_ok(),
648-
"event is was not parsed as expected {:?} given {}",
649-
result,
650-
input
630+
"event is was not parsed as expected {result:?} given {input}"
651631
);
652632
let request = result.expect("failed to parse request");
653633

@@ -668,9 +648,7 @@ mod tests {
668648
let result = from_str(input);
669649
assert!(
670650
result.is_ok(),
671-
"event is was not parsed as expected {:?} given {}",
672-
result,
673-
input
651+
"event is was not parsed as expected {result:?} given {input}"
674652
);
675653
let request = result.expect("failed to parse request");
676654
assert!(!request.query_string_parameters().is_empty());
@@ -690,9 +668,7 @@ mod tests {
690668
let result = from_str(input);
691669
assert!(
692670
result.is_ok(),
693-
"event is was not parsed as expected {:?} given {}",
694-
result,
695-
input
671+
"event is was not parsed as expected {result:?} given {input}"
696672
);
697673
let request = result.expect("failed to parse request");
698674
assert!(!request.query_string_parameters().is_empty());
@@ -718,9 +694,7 @@ mod tests {
718694
let result = from_str(input);
719695
assert!(
720696
result.is_ok(),
721-
"event was not parsed as expected {:?} given {}",
722-
result,
723-
input
697+
"event was not parsed as expected {result:?} given {input}"
724698
);
725699
let req = result.expect("failed to parse request");
726700
assert_eq!(req.method(), "GET");
@@ -734,9 +708,7 @@ mod tests {
734708
let result = from_str(input);
735709
assert!(
736710
result.is_ok(),
737-
"event was not parsed as expected {:?} given {}",
738-
result,
739-
input
711+
"event was not parsed as expected {result:?} given {input}"
740712
);
741713
let req = result.expect("failed to parse request");
742714
assert_eq!(req.method(), "GET");
@@ -750,9 +722,7 @@ mod tests {
750722
let result = from_str(input);
751723
assert!(
752724
result.is_ok(),
753-
"event was not parsed as expected {:?} given {}",
754-
result,
755-
input
725+
"event was not parsed as expected {result:?} given {input}"
756726
);
757727
let req = result.expect("failed to parse request");
758728
assert_eq!(req.method(), "GET");
@@ -766,9 +736,7 @@ mod tests {
766736
let result = from_str(input);
767737
assert!(
768738
result.is_ok(),
769-
"event was not parsed as expected {:?} given {}",
770-
result,
771-
input
739+
"event was not parsed as expected {result:?} given {input}"
772740
);
773741
let req = result.expect("failed to parse request");
774742
assert_eq!(req.uri(), "https://id.execute-api.us-east-1.amazonaws.com/my/path-with%20space?parameter1=value1&parameter1=value2&parameter2=value");

‎lambda-runtime-api-client/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![deny(clippy::all, clippy::cargo)]
22
#![warn(missing_docs, nonstandard_style, rust_2018_idioms)]
3-
#![warn(clippy::multiple_crate_versions)]
3+
#![allow(clippy::multiple_crate_versions)]
44

55
//! This crate includes a base HTTP client to interact with
66
//! the AWS Lambda Runtime API.

‎lambda-runtime/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,15 +323,15 @@ mod endpoint_tests {
323323
.body(Body::empty())
324324
.expect("Unable to construct response");
325325

326-
let expected = format!("/2018-06-01/runtime/invocation/{}/response", id);
326+
let expected = format!("/2018-06-01/runtime/invocation/{id}/response");
327327
assert_eq!(expected, req.uri().path());
328328

329329
Ok(rsp)
330330
}
331331

332332
#[cfg(test)]
333333
async fn event_err(req: &Request<Body>, id: &str) -> Result<Response<Body>, Error> {
334-
let expected = format!("/2018-06-01/runtime/invocation/{}/error", id);
334+
let expected = format!("/2018-06-01/runtime/invocation/{id}/error");
335335
assert_eq!(expected, req.uri().path());
336336

337337
assert_eq!(req.method(), Method::POST);

‎lambda-runtime/src/simulated.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ impl hyper::service::Service<Uri> for Connector {
6666
fn call(&mut self, uri: Uri) -> Self::Future {
6767
let res = match self.inner.lock() {
6868
Ok(mut map) if map.contains_key(&uri) => Ok(map.remove(&uri).unwrap()),
69-
Ok(_) => Err(format!("Uri {} is not in map", uri).into()),
69+
Ok(_) => Err(format!("Uri {uri} is not in map").into()),
7070
Err(_) => Err("mutex was poisoned".into()),
7171
};
7272
Box::pin(async move { res })

0 commit comments

Comments
 (0)