Skip to content

Commit fad048c

Browse files
ajewellamzajewellamz
authored
chore: update to async-friendly Rust (#749)
1 parent 3ce52fa commit fad048c

File tree

31 files changed

+222
-145
lines changed

31 files changed

+222
-145
lines changed

‎.github/workflows/dafny_interop_test_net.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
dotnet-version: "6.0.x"
5858

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

@@ -91,7 +91,7 @@ jobs:
9191
make transpile_net CORES=$CORES
9292
9393
- name: Setup ESDK Dafny
94-
uses: dafny-lang/setup-dafny-action@v1.7.2
94+
uses: dafny-lang/setup-dafny-action@v1.8.0
9595
with:
9696
dafny-version: ${{ inputs.esdk-dafny}}
9797

‎.github/workflows/dafny_interop_test_vector_net.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
dotnet-version: "6.0.x"
5757

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

@@ -90,7 +90,7 @@ jobs:
9090
make transpile_net CORES=$CORES
9191
9292
- name: Setup ESDK Dafny
93-
uses: dafny-lang/setup-dafny-action@v1.7.2
93+
uses: dafny-lang/setup-dafny-action@v1.8.0
9494
with:
9595
dafny-version: ${{ inputs.esdk-dafny}}
9696

@@ -163,7 +163,7 @@ jobs:
163163
dotnet-version: "6.0.x"
164164

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

@@ -197,7 +197,7 @@ jobs:
197197
make transpile_net CORES=$CORES
198198
199199
- name: Setup ESDK Dafny
200-
uses: dafny-lang/setup-dafny-action@v1.7.2
200+
uses: dafny-lang/setup-dafny-action@v1.8.0
201201
with:
202202
dafny-version: ${{ inputs.esdk-dafny}}
203203

‎.github/workflows/library_codegen.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
# and to translate version strings such as "nightly-latest"
4242
# to an actual DAFNY_VERSION.
4343
- name: Setup Dafny
44-
uses: dafny-lang/setup-dafny-action@v1.7.0
44+
uses: dafny-lang/setup-dafny-action@v1.8.0
4545
with:
4646
dafny-version: ${{ inputs.dafny }}
4747

‎.github/workflows/library_dafny_verification.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
dotnet-version: "6.0.x"
4444

4545
- name: Setup Dafny
46-
uses: dafny-lang/setup-dafny-action@v1.7.0
46+
uses: dafny-lang/setup-dafny-action@v1.8.0
4747
with:
4848
dafny-version: ${{ inputs.dafny }}
4949

‎.github/workflows/library_go_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
role-session-name: GoTests
5151

5252
- name: Setup Dafny
53-
uses: dafny-lang/setup-dafny-action@v1.7.0
53+
uses: dafny-lang/setup-dafny-action@v1.8.0
5454
with:
5555
dafny-version: ${{ inputs.dafny }}
5656

‎.github/workflows/library_interop_test_vectors.yml‎

Lines changed: 18 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,6 @@ jobs:
7272
uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
7373
with:
7474
components: rustfmt
75-
# TODO - uncomment this after Rust formatter works
76-
# - name: Rustfmt Check
77-
# uses: actions-rust-lang/rustfmt@v1
78-
79-
# TODO: Remove this after the formatting in Rust starts working
80-
- name: smithy-dafny Rust hacks
81-
if: matrix.language == 'rust'
82-
shell: bash
83-
run: |
84-
if [ "$RUNNER_OS" == "macOS" ]; then
85-
sed -i '' 's|rustfmt --edition 2021 runtimes/rust/src/implementation_from_dafny.rs|#&|' mpl/smithy-dafny/SmithyDafnyMakefile.mk
86-
else
87-
sed -i 's|rustfmt --edition 2021 runtimes/rust/src/implementation_from_dafny.rs|#&|' mpl/smithy-dafny/SmithyDafnyMakefile.mk
88-
fi
8975

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

103-
- name: Setup Dafny
104-
uses: dafny-lang/setup-dafny-action@v1.7.0
89+
- name: Setup Dafny Rust
90+
if: matrix.language == 'rust'
91+
uses: dafny-lang/setup-dafny-action@v1.8.0
92+
with:
93+
dafny-version: nightly-2025-01-30-7db1e5f
94+
95+
- name: Setup Dafny Not Rust
96+
if: matrix.language != 'rust'
97+
uses: dafny-lang/setup-dafny-action@v1.8.0
10598
with:
10699
dafny-version: ${{ inputs.dafny }}
107100

@@ -136,7 +129,6 @@ jobs:
136129
if: matrix.language == 'rust'
137130
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
138131

139-
# TODO: Remove this after checking in Rust polymorph code
140132
- name: Run make polymorph_rust
141133
if: matrix.language == 'rust'
142134
shell: bash
@@ -251,20 +243,6 @@ jobs:
251243
uses: actions-rust-lang/setup-rust-toolchain@v1.10.1
252244
with:
253245
components: rustfmt
254-
# TODO - uncomment this after Rust formatter works
255-
# - name: Rustfmt Check
256-
# uses: actions-rust-lang/rustfmt@v1
257-
258-
# TODO: Remove this after the formatting in Rust starts working
259-
- name: smithy-dafny Rust hacks
260-
if: matrix.decrypting_language == 'rust'
261-
shell: bash
262-
run: |
263-
if [ "$RUNNER_OS" == "macOS" ]; then
264-
sed -i '' 's|rustfmt --edition 2021 runtimes/rust/src/implementation_from_dafny.rs|#&|' mpl/smithy-dafny/SmithyDafnyMakefile.mk
265-
else
266-
sed -i 's|rustfmt --edition 2021 runtimes/rust/src/implementation_from_dafny.rs|#&|' mpl/smithy-dafny/SmithyDafnyMakefile.mk
267-
fi
268246

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

282-
- name: Setup Dafny
283-
uses: dafny-lang/setup-dafny-action@v1.6.1
260+
- name: Setup Dafny Rust
261+
if: matrix.decrypting_language == 'rust'
262+
uses: dafny-lang/setup-dafny-action@v1.8.0
263+
with:
264+
dafny-version: nightly-2025-01-30-7db1e5f
265+
266+
- name: Setup Dafny Not Rust
267+
if: matrix.decrypting_language != 'rust'
268+
uses: dafny-lang/setup-dafny-action@v1.8.0
284269
with:
285270
dafny-version: ${{ inputs.dafny }}
286271

@@ -315,7 +300,6 @@ jobs:
315300
if: matrix.decrypting_language == 'rust'
316301
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
317302

318-
# TODO: Remove this after checking in Rust polymorph code
319303
- name: Run make polymorph_rust
320304
if: matrix.decrypting_language == 'rust'
321305
shell: bash

‎.github/workflows/library_interop_tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
dotnet-version: "6.0.x"
5757

5858
- name: Setup Dafny
59-
uses: dafny-lang/setup-dafny-action@v1.6.1
59+
uses: dafny-lang/setup-dafny-action@v1.8.0
6060
with:
6161
dafny-version: ${{ inputs.dafny }}
6262

@@ -150,7 +150,7 @@ jobs:
150150
dotnet-version: "6.0.x"
151151

152152
- name: Setup Dafny
153-
uses: dafny-lang/setup-dafny-action@v1.6.1
153+
uses: dafny-lang/setup-dafny-action@v1.8.0
154154
with:
155155
dafny-version: ${{ inputs.dafny }}
156156

‎.github/workflows/library_java_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
role-session-name: JavaTests
5050

5151
- name: Setup Dafny
52-
uses: dafny-lang/setup-dafny-action@v1.7.0
52+
uses: dafny-lang/setup-dafny-action@v1.8.0
5353
with:
5454
dafny-version: ${{ inputs.dafny }}
5555

‎.github/workflows/library_legacy_interop_test_vectors.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
java-version: 17
7575

7676
- name: Setup Dafny
77-
uses: dafny-lang/setup-dafny-action@v1.6.1
77+
uses: dafny-lang/setup-dafny-action@v1.8.0
7878
with:
7979
dafny-version: ${{ inputs.dafny }}
8080

‎.github/workflows/library_net_tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
dotnet-version: "6.0.x"
6464

6565
- name: Setup Dafny
66-
uses: dafny-lang/setup-dafny-action@v1.7.0
66+
uses: dafny-lang/setup-dafny-action@v1.8.0
6767
with:
6868
dafny-version: ${{ inputs.dafny }}
6969

@@ -169,7 +169,7 @@ jobs:
169169
dotnet-version: "6.0.x"
170170

171171
- name: Setup Dafny
172-
uses: dafny-lang/setup-dafny-action@v1.7.0
172+
uses: dafny-lang/setup-dafny-action@v1.8.0
173173
with:
174174
dafny-version: ${{ inputs.dafny }}
175175

0 commit comments

Comments
 (0)