Skip to content
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

Update crates to Rust 2021 #1388

Merged
merged 1 commit into from
May 13, 2022
Merged

Update crates to Rust 2021 #1388

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
6 changes: 6 additions & 0 deletions CHANGELOG.next.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,9 @@ for chunk in byte_streams {
references = ["aws-sdk-rust#494", "aws-sdk-rust#519"]
meta = { "breaking" = true, "tada" = true, "bug" = false }
author = "Velfi"

[[smithy-rs]]
message = "Update generated crates to Rust 2021"
references = ["smithy-rs#1332"]
meta = { "breaking" = false, "tada" = false, "bug" = false }
author = "82marbag"
2 changes: 1 addition & 1 deletion ...re/amazon/smithy/rust/codegen/server/smithy/protocols/ServerHttpBoundProtocolGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ private class ServerHttpBoundProtocolTraitImplGenerator(
"""
let status = output.$memberName
.ok_or(#{ResponseRejection}::MissingHttpStatusCode)?;
let http_status: u16 = std::convert::TryFrom::<i32>::try_from(status)
let http_status: u16 = status.try_into()
.map_err(|_| #{ResponseRejection}::InvalidHttpStatusCode)?;
""".trimIndent(),
*codegenScope,
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/kotlin/software/amazon/smithy/rust/codegen/smithy/generators/CargoTomlGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class CargoTomlGenerator(
"version" to settings.moduleVersion,
"authors" to settings.moduleAuthors,
settings.moduleDescription?.let { "description" to it },
"edition" to "2018",
"edition" to "2021",
"license" to settings.license,
"repository" to settings.moduleRepository,
).toMap(),
Expand Down
2 changes: 0 additions & 2 deletions ...kotlin/software/amazon/smithy/rust/codegen/smithy/generators/http/HttpBindingGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,6 @@ class HttpBindingGenerator(
rustBlock("if !$safeName.is_empty()") {
rustTemplate(
"""
use std::convert::TryFrom;
let header_value = $safeName;
let header_value = http::header::HeaderValue::try_from(&*header_value).map_err(|err| {
#{build_error}::InvalidField { field: "$memberName", details: format!("`{}` cannot be used as a header value: {}", &${
Expand Down Expand Up @@ -517,7 +516,6 @@ class HttpBindingGenerator(
let header_name = http::header::HeaderName::from_str(&format!("{}{}", "${httpBinding.locationName}", &k)).map_err(|err| {
#{build_error}::InvalidField { field: "$memberName", details: format!("`{}` cannot be used as a header name: {}", k, err)}
})?;
use std::convert::TryFrom;
let header_value = ${headerFmtFun(this, target, memberShape, "v", listHeader)};
let header_value = http::header::HeaderValue::try_from(&*header_value).map_err(|err| {
#{build_error}::InvalidField {
Expand Down
4 changes: 0 additions & 4 deletions ...tware/amazon/smithy/rust/codegen/smithy/protocols/parse/XmlBindingTraitParserGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ class XmlBindingTraitParserGenerator(
val shapeName = XmlName(xmlIndex.payloadShapeName(member))
rustTemplate(
"""
use std::convert::TryFrom;
let mut doc = #{Document}::try_from(inp)?;
##[allow(unused_mut)]
let mut decoder = doc.root_element()?;
Expand Down Expand Up @@ -190,7 +189,6 @@ class XmlBindingTraitParserGenerator(
) {
rustTemplate(
"""
use std::convert::TryFrom;
let mut doc = #{Document}::try_from(inp)?;

##[allow(unused_mut)]
Expand Down Expand Up @@ -226,7 +224,6 @@ class XmlBindingTraitParserGenerator(
if (members.isNotEmpty()) {
rustTemplate(
"""
use std::convert::TryFrom;
let mut document = #{Document}::try_from(inp)?;
##[allow(unused_mut)]
let mut error_decoder = #{xml_errors}::error_scope(&mut document)?;
Expand Down Expand Up @@ -258,7 +255,6 @@ class XmlBindingTraitParserGenerator(
) {
rustTemplate(
"""
use std::convert::TryFrom;
let mut doc = #{Document}::try_from(inp)?;

##[allow(unused_mut)]
Expand Down