From 41fe9f3e0742e41257027af10bb42c6a7f612bcf Mon Sep 17 00:00:00 2001 From: Colton Weaver Date: Sat, 30 Oct 2021 17:27:18 -0700 Subject: [PATCH 1/2] Fixed cargo clippy warnings --- lambda-http/src/request.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lambda-http/src/request.rs b/lambda-http/src/request.rs index 352ba780..5eb10817 100644 --- a/lambda-http/src/request.rs +++ b/lambda-http/src/request.rs @@ -363,7 +363,7 @@ where T: Default + Deserialize<'de>, { let opt = Option::deserialize(deserializer)?; - Ok(opt.unwrap_or_else(T::default)) + Ok(opt.unwrap_or_default()) } /// Converts LambdaRequest types into `http::Request` types @@ -397,7 +397,7 @@ impl<'a> From> for http::Request { headers .get("X-Forwarded-Proto") .and_then(|val| val.to_str().ok()) - .unwrap_or_else(|| "https"), + .unwrap_or("https"), headers .get(http::header::HOST) .and_then(|val| val.to_str().ok()) @@ -445,7 +445,7 @@ impl<'a> From> for http::Request { headers .get("X-Forwarded-Proto") .and_then(|val| val.to_str().ok()) - .unwrap_or_else(|| "https"), + .unwrap_or("https"), headers .get(http::header::HOST) .and_then(|val| val.to_str().ok()) @@ -508,7 +508,7 @@ impl<'a> From> for http::Request { headers .get("X-Forwarded-Proto") .and_then(|val| val.to_str().ok()) - .unwrap_or_else(|| "https"), + .unwrap_or("https"), headers .get(http::header::HOST) .and_then(|val| val.to_str().ok()) @@ -609,7 +609,7 @@ mod tests { // https://docs.aws.amazon.com/lambda/latest/dg/eventsources.html#eventsources-api-gateway-request // note: file paths are relative to the directory of the crate at runtime let result = from_reader(File::open("tests/data/apigw_proxy_request.json").expect("expected file")); - assert!(result.is_ok(), format!("event was not parsed as expected {:?}", result)); + assert!(result.is_ok(), "event was not parsed as expected {:?}", result); } #[test] @@ -620,7 +620,7 @@ mod tests { let result = from_str(input); assert!( result.is_ok(), - format!("event was not parsed as expected {:?} given {}", result, input) + "event was not parsed as expected {:?} given {}", result, input ); let req = result.expect("failed to parse request"); assert_eq!(req.method(), "GET"); @@ -635,7 +635,7 @@ mod tests { let result = from_str(input); assert!( result.is_ok(), - format!("event was not parsed as expected {:?} given {}", result, input) + "event was not parsed as expected {:?} given {}", result, input ); let req = result.expect("failed to parse request"); let cookie_header = req @@ -658,7 +658,7 @@ mod tests { let result = from_str(input); assert!( result.is_ok(), - format!("event was not parsed as expected {:?} given {}", result, input) + "event was not parsed as expected {:?} given {}", result, input ); let req = result.expect("failed to parse request"); assert_eq!(req.method(), "GET"); @@ -676,7 +676,7 @@ mod tests { let result = from_str(input); assert!( result.is_ok(), - format!("event was not parsed as expected {:?} given {}", result, input) + "event was not parsed as expected {:?} given {}", result, input ); let req = result.expect("failed to parse request"); assert_eq!(req.method(), "GET"); @@ -691,7 +691,7 @@ mod tests { let result = from_str(input); assert!( result.is_ok(), - format!("event is was not parsed as expected {:?} given {}", result, input) + "event is was not parsed as expected {:?} given {}", result, input ); let request = result.expect("failed to parse request"); @@ -712,7 +712,7 @@ mod tests { let result = from_str(input); assert!( result.is_ok(), - format!("event is was not parsed as expected {:?} given {}", result, input) + "event is was not parsed as expected {:?} given {}", result, input ); let request = result.expect("failed to parse request"); assert!(!request.query_string_parameters().is_empty()); From 3b2991aecfc3e2762ca7d08479af28aaa7ee5454 Mon Sep 17 00:00:00 2001 From: Colton Weaver Date: Sat, 30 Oct 2021 17:29:59 -0700 Subject: [PATCH 2/2] Fixed fmt errors --- lambda-http/src/request.rs | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/lambda-http/src/request.rs b/lambda-http/src/request.rs index 5eb10817..5fa5a2b7 100644 --- a/lambda-http/src/request.rs +++ b/lambda-http/src/request.rs @@ -620,7 +620,9 @@ mod tests { let result = from_str(input); assert!( result.is_ok(), - "event was not parsed as expected {:?} given {}", result, input + "event was not parsed as expected {:?} given {}", + result, + input ); let req = result.expect("failed to parse request"); assert_eq!(req.method(), "GET"); @@ -635,7 +637,9 @@ mod tests { let result = from_str(input); assert!( result.is_ok(), - "event was not parsed as expected {:?} given {}", result, input + "event was not parsed as expected {:?} given {}", + result, + input ); let req = result.expect("failed to parse request"); let cookie_header = req @@ -658,7 +662,9 @@ mod tests { let result = from_str(input); assert!( result.is_ok(), - "event was not parsed as expected {:?} given {}", result, input + "event was not parsed as expected {:?} given {}", + result, + input ); let req = result.expect("failed to parse request"); assert_eq!(req.method(), "GET"); @@ -676,7 +682,9 @@ mod tests { let result = from_str(input); assert!( result.is_ok(), - "event was not parsed as expected {:?} given {}", result, input + "event was not parsed as expected {:?} given {}", + result, + input ); let req = result.expect("failed to parse request"); assert_eq!(req.method(), "GET"); @@ -691,7 +699,9 @@ mod tests { let result = from_str(input); assert!( result.is_ok(), - "event is was not parsed as expected {:?} given {}", result, input + "event is was not parsed as expected {:?} given {}", + result, + input ); let request = result.expect("failed to parse request"); @@ -712,7 +722,9 @@ mod tests { let result = from_str(input); assert!( result.is_ok(), - "event is was not parsed as expected {:?} given {}", result, input + "event is was not parsed as expected {:?} given {}", + result, + input ); let request = result.expect("failed to parse request"); assert!(!request.query_string_parameters().is_empty());