Skip to content

chore: update to async-friendly Rust #749

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

Merged
ajewellamz merged 18 commits into from
Jan 31, 2025
Merged

chore: update to async-friendly Rust #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7d9f9ae
chore: update to async-friendly Rust
ajewellamz Jan 28, 2025
2ea5252
m
ajewellamz Jan 28, 2025
b2b7ee3
m
ajewellamz Jan 28, 2025
cd1aec8
m
ajewellamz Jan 28, 2025
41f833a
m
ajewellamz Jan 29, 2025
a82cc7b
m
ajewellamz Jan 29, 2025
40ea64e
m
ajewellamz Jan 29, 2025
5443ff8
m
ajewellamz Jan 29, 2025
6ffd796
m
ajewellamz Jan 29, 2025
fe9e54f
m
ajewellamz Jan 29, 2025
5d1996c
m
ajewellamz Jan 29, 2025
dd1db11
Merge branch 'mainline' into ajewell/async-rust
ajewellamz Jan 30, 2025
4229f85
m
ajewellamz Jan 30, 2025
e28b7ca
m
ajewellamz Jan 31, 2025
cea4416
m
ajewellamz Jan 31, 2025
8c843fc
m
ajewellamz Jan 31, 2025
6490749
m
ajewellamz Jan 31, 2025
875e0f4
m
ajewellamz Jan 31, 2025
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 .github/workflows/dafny_interop_test_net.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
dotnet-version: "6.0.x"

- name: Setup MPL Dafny
uses: dafny-lang/setup-dafny-action@v1.7.2
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.mpl-dafny }}

Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
make transpile_net CORES=$CORES

- name: Setup ESDK Dafny
uses: dafny-lang/setup-dafny-action@v1.7.2
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.esdk-dafny}}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dafny_interop_test_vector_net.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
dotnet-version: "6.0.x"

- name: Setup MPL Dafny
uses: dafny-lang/setup-dafny-action@v1.7.2
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.mpl-dafny }}

Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
make transpile_net CORES=$CORES

- name: Setup ESDK Dafny
uses: dafny-lang/setup-dafny-action@v1.7.2
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.esdk-dafny}}

Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
dotnet-version: "6.0.x"

- name: Setup MPL Dafny
uses: dafny-lang/setup-dafny-action@v1.7.2
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.mpl-dafny }}

Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:
make transpile_net CORES=$CORES

- name: Setup ESDK Dafny
uses: dafny-lang/setup-dafny-action@v1.7.2
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.esdk-dafny}}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/library_codegen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
# and to translate version strings such as "nightly-latest"
# to an actual DAFNY_VERSION.
- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.7.0
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/library_dafny_verification.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
dotnet-version: "6.0.x"

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.7.0
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/library_go_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
role-session-name: GoTests

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.7.0
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
52 changes: 18 additions & 34 deletions .github/workflows/library_interop_test_vectors.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,6 @@ jobs:
uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with:
components: rustfmt
# TODO - uncomment this after Rust formatter works
# - name: Rustfmt Check
# uses: actions-rust-lang/rustfmt@v1

# TODO: Remove this after the formatting in Rust starts working
- name: smithy-dafny Rust hacks
if: matrix.language == 'rust'
shell: bash
run: |
if [ "$RUNNER_OS" == "macOS" ]; then
sed -i '' 's|rustfmt --edition 2021 runtimes/rust/src/implementation_from_dafny.rs|#&|' mpl/smithy-dafny/SmithyDafnyMakefile.mk
else
sed -i 's|rustfmt --edition 2021 runtimes/rust/src/implementation_from_dafny.rs|#&|' mpl/smithy-dafny/SmithyDafnyMakefile.mk
fi

- name: Setup Go
uses: actions/setup-go@v5
Expand All @@ -100,8 +86,15 @@ jobs:
if: matrix.language == 'rust' && matrix.os == 'windows-latest'
uses: ilammy/setup-nasm@v1

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.7.0
- name: Setup Dafny Rust
if: matrix.language == 'rust'
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: nightly-2025-01-30-7db1e5f

- name: Setup Dafny Not Rust
if: matrix.language != 'rust'
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.dafny }}

Expand Down Expand Up @@ -136,7 +129,6 @@ jobs:
if: matrix.language == 'rust'
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies

# TODO: Remove this after checking in Rust polymorph code
- name: Run make polymorph_rust
if: matrix.language == 'rust'
shell: bash
Expand Down Expand Up @@ -251,20 +243,6 @@ jobs:
uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with:
components: rustfmt
# TODO - uncomment this after Rust formatter works
# - name: Rustfmt Check
# uses: actions-rust-lang/rustfmt@v1

# TODO: Remove this after the formatting in Rust starts working
- name: smithy-dafny Rust hacks
if: matrix.decrypting_language == 'rust'
shell: bash
run: |
if [ "$RUNNER_OS" == "macOS" ]; then
sed -i '' 's|rustfmt --edition 2021 runtimes/rust/src/implementation_from_dafny.rs|#&|' mpl/smithy-dafny/SmithyDafnyMakefile.mk
else
sed -i 's|rustfmt --edition 2021 runtimes/rust/src/implementation_from_dafny.rs|#&|' mpl/smithy-dafny/SmithyDafnyMakefile.mk
fi

- name: Setup Go
uses: actions/setup-go@v5
Expand All @@ -279,8 +257,15 @@ jobs:
if: matrix.decrypting_language == 'rust' && matrix.os == 'windows-latest'
uses: ilammy/setup-nasm@v1

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.6.1
- name: Setup Dafny Rust
if: matrix.decrypting_language == 'rust'
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: nightly-2025-01-30-7db1e5f

- name: Setup Dafny Not Rust
if: matrix.decrypting_language != 'rust'
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.dafny }}

Expand Down Expand Up @@ -315,7 +300,6 @@ jobs:
if: matrix.decrypting_language == 'rust'
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies

# TODO: Remove this after checking in Rust polymorph code
- name: Run make polymorph_rust
if: matrix.decrypting_language == 'rust'
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/library_interop_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
dotnet-version: "6.0.x"

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.6.1
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.dafny }}

Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
dotnet-version: "6.0.x"

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.6.1
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/library_java_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
role-session-name: JavaTests

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.7.0
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/library_legacy_interop_test_vectors.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
java-version: 17

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.6.1
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/library_net_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
dotnet-version: "6.0.x"

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.7.0
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.dafny }}

Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
dotnet-version: "6.0.x"

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.7.0
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.dafny }}

Expand Down
42 changes: 6 additions & 36 deletions .github/workflows/library_rust_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,11 @@ jobs:
uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with:
components: rustfmt
# TODO - uncomment this after Rust formatter works
# - name: Rustfmt Check
# uses: actions-rust-lang/rustfmt@v1

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.7.0
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.dafny }}

# TODO: Remove this after the formatting in Rust starts working
- name: smithy-dafny Rust hacks
shell: bash
run: |
if [ "$RUNNER_OS" == "macOS" ]; then
sed -i '' 's|rustfmt --edition 2021 runtimes/rust/src/implementation_from_dafny.rs|#&|' mpl/smithy-dafny/SmithyDafnyMakefile.mk
else
sed -i 's|rustfmt --edition 2021 runtimes/rust/src/implementation_from_dafny.rs|#&|' mpl/smithy-dafny/SmithyDafnyMakefile.mk
fi
dafny-version: nightly-2025-01-30-7db1e5f

- name: Setup Java 17 for codegen
uses: actions/setup-java@v3
Expand All @@ -88,8 +75,6 @@ jobs:
diff-generated-code: false
update-and-regenerate-mpl: true

# TODO: Remove this after checking in Rust polymorph code
# Also uncomment rust check_polymorph_diff for Rust in .github/actions/polymorph_codegen/action.yml
- name: Run make polymorph_rust
shell: bash
working-directory: ${{ matrix.library }}
Expand All @@ -115,7 +100,7 @@ jobs:
working-directory: ${{ matrix.library }}
shell: bash
run: |
make test_rust
make test_rust test_rust_debug

- name: Test Examples for Rust
working-directory: ${{ matrix.library }}/runtimes/rust
Expand Down Expand Up @@ -160,24 +145,11 @@ jobs:
uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
with:
components: rustfmt
# TODO - uncomment this after Rust formatter works
# - name: Rustfmt Check
# uses: actions-rust-lang/rustfmt@v1

- name: Setup Dafny
uses: dafny-lang/setup-dafny-action@v1.7.0
uses: dafny-lang/setup-dafny-action@v1.8.0
with:
dafny-version: ${{ inputs.dafny }}

# TODO: Remove this after the formatting in Rust starts working
- name: smithy-dafny Rust hacks
shell: bash
run: |
if [ "$RUNNER_OS" == "macOS" ]; then
sed -i '' 's|rustfmt --edition 2021 runtimes/rust/src/implementation_from_dafny.rs|#&|' mpl/smithy-dafny/SmithyDafnyMakefile.mk
else
sed -i 's|rustfmt --edition 2021 runtimes/rust/src/implementation_from_dafny.rs|#&|' mpl/smithy-dafny/SmithyDafnyMakefile.mk
fi
dafny-version: nightly-2025-01-30-7db1e5f

- name: Setup Java 17 for codegen
uses: actions/setup-java@v3
Expand All @@ -201,8 +173,6 @@ jobs:
diff-generated-code: false
update-and-regenerate-mpl: true

# TODO: Remove this after checking in Rust polymorph code
# Also uncomment rust check_polymorph_diff for Rust in .github/actions/polymorph_codegen/action.yml
- name: Run make polymorph_rust
shell: bash
working-directory: ${{ matrix.library }}
Comment thread
ajewellamz marked this conversation as resolved.
Expand Down Expand Up @@ -231,4 +201,4 @@ jobs:
run: |
# Without this, running test vectors fails due to `fatal runtime error: stack overflow`
export RUST_MIN_STACK=104857600
make test_rust
make test_rust test_rust_debug
23 changes: 23 additions & 0 deletions ...mes/go/ImplementationFromDafny-go/awscryptographyencryptionsdksmithygenerated/to_dafny.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions ...es/go/ImplementationFromDafny-go/awscryptographyencryptionsdksmithygenerated/to_native.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading