fix: escape members from smithy because they might be reserved words (#…

…768)
smithy-lang · Jan 22, 2025 · 6475c2e · 6475c2e
1 parent 5fb8654
commit 6475c2e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...src/main/java/software/amazon/polymorph/smithyrust/generator/RustAwsSdkShimGenerator.java b/...src/main/java/software/amazon/polymorph/smithyrust/generator/RustAwsSdkShimGenerator.java
@@ -217,7 +217,7 @@ private TokenTree operationClientFunction(
         .stream()
         .map(member ->
           evalTemplate(
-            ".set_$fieldName:L(inner_input.$fieldName:L)",
+            ".set_$fieldName:L(inner_input.r#$fieldName:L)",
             structureMemberVariables(member)
           )
         )

diff --git a/...rc/main/java/software/amazon/polymorph/smithyrust/generator/RustLibraryShimGenerator.java b/...rc/main/java/software/amazon/polymorph/smithyrust/generator/RustLibraryShimGenerator.java
@@ -798,7 +798,7 @@ private RustFile operationOuterModule(
         // but not on the Dafny side.
         final MemberShape onlyMember = PositionalTrait.onlyMember(inputShape);
         final String rustValue =
-          "input." + toSnakeCase(onlyMember.getMemberName());
+          "input.r#" + toSnakeCase(onlyMember.getMemberName());
         variables.put(
           "inputToDafny",
           toDafny(inputShape, rustValue, true, false).toString()
@@ -1096,14 +1096,14 @@ private String generateValidationFunction(
             ) {
               validationBlocks.add(
                 evalTemplate(
-                  "$memberValidationFunctionName:L(&Some(input.$fieldName:L.clone()))?;",
+                  "$memberValidationFunctionName:L(&Some(input.r#$fieldName:L.clone()))?;",
                   memberVariables
                 )
               );
             } else {
               validationBlocks.add(
                 evalTemplate(
-                  "$memberValidationFunctionName:L(&input.$fieldName:L)?;",
+                  "$memberValidationFunctionName:L(&input.r#$fieldName:L)?;",
                   memberVariables
                 )
               );
@@ -1851,7 +1851,7 @@ private String resourceOperationWrapperImpl(
       // since on the Rust side there is still an input structure
       // but not on the Dafny side.
       final MemberShape onlyMember = PositionalTrait.onlyMember(inputShape);
-      final String rustValue = "input." + onlyMember.getMemberName() + "()";
+      final String rustValue = "input.r#" + onlyMember.getMemberName() + "()";
       variables.put(
         "inputFromDafny",
         fromDafny(inputShape, rustValue, false, false).toString()
@@ -1912,7 +1912,7 @@ private String resourceOperationDafnyWrapperImpl(
       // but not on the Dafny side.
       final MemberShape onlyMember = PositionalTrait.onlyMember(inputShape);
       final String rustValue =
-        "input." + toSnakeCase(onlyMember.getMemberName());
+        "input.r#" + toSnakeCase(onlyMember.getMemberName());
       variables.put(
         "inputToDafny",
         toDafny(inputShape, rustValue, true, false).toString()