fix: DB ESDK regressions (#630)

A few case of bad merges into #591 that CI didn't catch (due to missing test model coverage, already tracked in related issues).
smithy-lang · Oct 10, 2024 · 4199690 · 4199690
1 parent 6cf0a44
commit 4199690
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...c/main/java/software/amazon/polymorph/smithyrust/generator/AbstractRustShimGenerator.java b/...c/main/java/software/amazon/polymorph/smithyrust/generator/AbstractRustShimGenerator.java
@@ -1080,7 +1080,7 @@ protected RustFile unionConversionModule(final UnionShape unionShape) {
           IOUtils.evalTemplate(
             """
             $qualifiedRustUnionName:L::$rustUnionMemberName:L(x) =>
-                crate::r#$dafnyTypesModuleName:L::$dafnyUnionName:L::$dafnyUnionMemberName:L {
+                crate::r#$dafnyTypesModuleName:L::$dafnyUnionName:L::$unionMemberName:L {
                     $dafnyUnionMemberName:L: $innerToDafny:L,
                 },
             """,
@@ -1096,7 +1096,7 @@ protected RustFile unionConversionModule(final UnionShape unionShape) {
         .map(memberVariables ->
           IOUtils.evalTemplate(
             """
-            crate::r#$dafnyTypesModuleName:L::$dafnyUnionName:L::$dafnyUnionMemberName:L {
+            crate::r#$dafnyTypesModuleName:L::$dafnyUnionName:L::$unionMemberName:L {
                 $dafnyUnionMemberName:L: x @ _,
             } => $qualifiedRustUnionName:L::$rustUnionMemberName:L($innerFromDafny:L),
             """,

diff --git a/...src/main/java/software/amazon/polymorph/smithyrust/generator/RustAwsSdkShimGenerator.java b/...src/main/java/software/amazon/polymorph/smithyrust/generator/RustAwsSdkShimGenerator.java
@@ -181,7 +181,7 @@ fn into(self) -> Client {
     }
 
     return new RustFile(
-      Path.of("src", "client.rs"),
+      rootPathForShape(service).resolve("client.rs"),
       TokenTree.of(preamble, postamble)
     );
   }

diff --git a/...rc/main/java/software/amazon/polymorph/smithyrust/generator/RustLibraryShimGenerator.java b/...rc/main/java/software/amazon/polymorph/smithyrust/generator/RustLibraryShimGenerator.java
@@ -1951,7 +1951,7 @@ protected TokenTree toDafny(
           final String coercion = isDafnyOption ? "into()" : "Extract()";
           yield TokenTree.of(
             """
-            (match %s {
+            std::rc::Rc::new(match %s {
               Some(s) => crate::_Wrappers_Compile::Option::Some { value: %s },
               None => crate::_Wrappers_Compile::Option::None {},
             }).%s""".formatted(rustValue, rustToDafny.formatted("s"), coercion)