Skip to content

Upgrade http to 0.2 #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Upgrade http to 0.2 #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lambda-http/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 8 additions & 8 deletions lambda-http/src/request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ where
for value in values {
let header_name = key.parse::<HeaderName>().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);
}
}
Expand Down Expand Up @@ -220,7 +220,7 @@ where
.unwrap_or_else(HeaderMap::new);
while let Some((key, value)) = map.next_entry::<Cow<'_, str>, Cow<'_, str>>()? {
let header_name = key.parse::<HeaderName>().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)
Expand Down Expand Up @@ -259,8 +259,8 @@ impl<'a> From<LambdaRequest<'a>> for HttpRequest<Body> {

// build an http::Request<lambda_http::Body> 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
Expand All @@ -277,16 +277,16 @@ impl<'a> From<LambdaRequest<'a>> for HttpRequest<Body> {
// 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 {
Expand Down