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

Jump to bottom

fix: DB ESDK regressions #630

Merged
merged 7 commits into from
Oct 10, 2024
Merged

fix: DB ESDK regressions #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bc65cda
fix client.rs path for dependent SDKs
robin-aws Oct 10, 2024
7ed94bd
Revert _None escaping
robin-aws Oct 10, 2024
5fe16be
Revert "Revert _None escaping"
robin-aws Oct 10, 2024
f9fa898
Proper _None fix
robin-aws Oct 10, 2024
595ecf8
Part two
robin-aws Oct 10, 2024
7038096
Missing std::rc::Rc::new
robin-aws Oct 10, 2024
46f7edb
Merge branch 'main-1.x' into robin-aws/fix-db-esdk-regressions
robin-aws Oct 10, 2024
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
4 changes: 2 additions & 2 deletions ...c/main/java/software/amazon/polymorph/smithyrust/generator/AbstractRustShimGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
""",
Expand All @@ -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),
""",
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/software/amazon/polymorph/smithyrust/generator/RustAwsSdkShimGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);
}
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/software/amazon/polymorph/smithyrust/generator/RustLibraryShimGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading