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

#[allow(unused_variables)] in JSON serializers when structure has no members #2538

Merged
merged 1 commit into from
Apr 5, 2023
Merged

#[allow(unused_variables)] in JSON serializers when structure has no members #2538

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
28 changes: 17 additions & 11 deletions ...are/amazon/smithy/rust/codegen/core/smithy/protocols/serialize/JsonSerializerGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@ import software.amazon.smithy.model.shapes.StructureShape
import software.amazon.smithy.model.shapes.TimestampShape
import software.amazon.smithy.model.shapes.UnionShape
import software.amazon.smithy.model.traits.TimestampFormatTrait.Format.EPOCH_SECONDS
import software.amazon.smithy.rust.codegen.core.rustlang.Attribute
import software.amazon.smithy.rust.codegen.core.rustlang.RustWriter
import software.amazon.smithy.rust.codegen.core.rustlang.rust
import software.amazon.smithy.rust.codegen.core.rustlang.rustBlock
import software.amazon.smithy.rust.codegen.core.rustlang.rustBlockTemplate
import software.amazon.smithy.rust.codegen.core.rustlang.rustTemplate
import software.amazon.smithy.rust.codegen.core.rustlang.withBlock
import software.amazon.smithy.rust.codegen.core.rustlang.writable
import software.amazon.smithy.rust.codegen.core.smithy.CodegenContext
import software.amazon.smithy.rust.codegen.core.smithy.RuntimeType
import software.amazon.smithy.rust.codegen.core.smithy.RustSymbolProvider
Expand Down Expand Up @@ -312,21 +314,25 @@ class JsonSerializerGenerator(
context: StructContext,
includedMembers: List<MemberShape>? = null,
) {
val structureSymbol = symbolProvider.toSymbol(context.shape)
val structureSerializer = protocolFunctions.serializeFn(context.shape) { fnName ->
val inner = context.copy(objectName = "object", localName = "input")
val members = includedMembers ?: inner.shape.members()
val allowUnusedVariables = writable {
if (members.isEmpty()) { Attribute.AllowUnusedVariables.render(this) }
}
rustBlockTemplate(
"pub fn $fnName(object: &mut #{JsonObjectWriter}, input: &#{Input}) -> Result<(), #{Error}>",
"Input" to structureSymbol,
"""
pub fn $fnName(
#{AllowUnusedVariables:W} object: &mut #{JsonObjectWriter},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you need the :W in #{AllowUnusedVariables:W} anymore.

#{AllowUnusedVariables:W} input: &#{StructureSymbol},
) -> Result<(), #{Error}>
""",
"StructureSymbol" to symbolProvider.toSymbol(context.shape),
"AllowUnusedVariables" to allowUnusedVariables,
*codegenScope,
) {
context.copy(objectName = "object", localName = "input").also { inner ->
val members = includedMembers ?: inner.shape.members()
if (members.isEmpty()) {
rust("let (_, _) = (object, input);") // Suppress unused argument warnings
}
for (member in members) {
serializeMember(MemberContext.structMember(inner, member, symbolProvider, jsonName))
}
for (member in members) {
serializeMember(MemberContext.structMember(inner, member, symbolProvider, jsonName))
}
rust("Ok(())")
}
Expand Down