diff --git a/lambda-http/Cargo.toml b/lambda-http/Cargo.toml index 48a7a05b..41e3f727 100644 --- a/lambda-http/Cargo.toml +++ b/lambda-http/Cargo.toml @@ -16,7 +16,7 @@ travis-ci = { repository = "awslabs/aws-lambda-rust-runtime" } maintenance = { status = "actively-developed" } [dependencies] -http = "0.1" +http = "0.2" serde = "^1" serde_json = "^1" serde_derive = "^1" diff --git a/lambda-http/src/request.rs b/lambda-http/src/request.rs index 141e4894..092eb2b8 100644 --- a/lambda-http/src/request.rs +++ b/lambda-http/src/request.rs @@ -184,7 +184,7 @@ where for value in values { let header_name = key.parse::().map_err(A::Error::custom)?; let header_value = - HeaderValue::from_shared(value.into_owned().into()).map_err(A::Error::custom)?; + HeaderValue::from_maybe_shared(value.into_owned()).map_err(A::Error::custom)?; headers.append(header_name, header_value); } } @@ -220,7 +220,7 @@ where .unwrap_or_else(HeaderMap::new); while let Some((key, value)) = map.next_entry::, Cow<'_, str>>()? { let header_name = key.parse::().map_err(A::Error::custom)?; - let header_value = HeaderValue::from_shared(value.into_owned().into()).map_err(A::Error::custom)?; + let header_value = HeaderValue::from_maybe_shared(value.into_owned()).map_err(A::Error::custom)?; headers.append(header_name, header_value); } Ok(headers) @@ -259,8 +259,8 @@ impl<'a> From> for HttpRequest { // build an http::Request from a lambda_http::LambdaRequest let mut builder = HttpRequest::builder(); - builder.method(http_method); - builder.uri({ + builder = builder.method(http_method); + builder = builder.uri({ format!( "{}://{}{}", headers @@ -277,16 +277,16 @@ impl<'a> From> for HttpRequest { // multi valued query string parameters are always a super // set of singly valued query string parameters, // when present, multi-valued query string parameters are preferred - builder.extension(QueryStringParameters( + builder = builder.extension(QueryStringParameters( if multi_value_query_string_parameters.is_empty() { query_string_parameters } else { multi_value_query_string_parameters }, )); - builder.extension(PathParameters(path_parameters)); - builder.extension(StageVariables(stage_variables)); - builder.extension(request_context); + builder = builder.extension(PathParameters(path_parameters)); + builder = builder.extension(StageVariables(stage_variables)); + builder = builder.extension(request_context); let mut req = builder .body(match body {