Skip to content

Commit 6475c2e

Browse files
authored
fix: escape members from smithy because they might be reserved words (#768)
1 parent 5fb8654 commit 6475c2e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithyrust/generator/RustAwsSdkShimGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ private TokenTree operationClientFunction(
217217
.stream()
218218
.map(member ->
219219
evalTemplate(
220-
".set_$fieldName:L(inner_input.$fieldName:L)",
220+
".set_$fieldName:L(inner_input.r#$fieldName:L)",
221221
structureMemberVariables(member)
222222
)
223223
)

codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithyrust/generator/RustLibraryShimGenerator.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ private RustFile operationOuterModule(
798798
// but not on the Dafny side.
799799
final MemberShape onlyMember = PositionalTrait.onlyMember(inputShape);
800800
final String rustValue =
801-
"input." + toSnakeCase(onlyMember.getMemberName());
801+
"input.r#" + toSnakeCase(onlyMember.getMemberName());
802802
variables.put(
803803
"inputToDafny",
804804
toDafny(inputShape, rustValue, true, false).toString()
@@ -1096,14 +1096,14 @@ private String generateValidationFunction(
10961096
) {
10971097
validationBlocks.add(
10981098
evalTemplate(
1099-
"$memberValidationFunctionName:L(&Some(input.$fieldName:L.clone()))?;",
1099+
"$memberValidationFunctionName:L(&Some(input.r#$fieldName:L.clone()))?;",
11001100
memberVariables
11011101
)
11021102
);
11031103
} else {
11041104
validationBlocks.add(
11051105
evalTemplate(
1106-
"$memberValidationFunctionName:L(&input.$fieldName:L)?;",
1106+
"$memberValidationFunctionName:L(&input.r#$fieldName:L)?;",
11071107
memberVariables
11081108
)
11091109
);
@@ -1851,7 +1851,7 @@ private String resourceOperationWrapperImpl(
18511851
// since on the Rust side there is still an input structure
18521852
// but not on the Dafny side.
18531853
final MemberShape onlyMember = PositionalTrait.onlyMember(inputShape);
1854-
final String rustValue = "input." + onlyMember.getMemberName() + "()";
1854+
final String rustValue = "input.r#" + onlyMember.getMemberName() + "()";
18551855
variables.put(
18561856
"inputFromDafny",
18571857
fromDafny(inputShape, rustValue, false, false).toString()
@@ -1912,7 +1912,7 @@ private String resourceOperationDafnyWrapperImpl(
19121912
// but not on the Dafny side.
19131913
final MemberShape onlyMember = PositionalTrait.onlyMember(inputShape);
19141914
final String rustValue =
1915-
"input." + toSnakeCase(onlyMember.getMemberName());
1915+
"input.r#" + toSnakeCase(onlyMember.getMemberName());
19161916
variables.put(
19171917
"inputToDafny",
19181918
toDafny(inputShape, rustValue, true, false).toString()

0 commit comments

Comments
 (0)