Skip to content

Commit f52bfd9

Browse files
committed
Fix references to rust-toolchain without .toml suffix
Two .gitignore files and a GitHub workflow referenced `rust-toolchain` without a `.toml` extension, but all the files in the repo and the generated files are `rust-toolchain.toml`. In addition, have the GitHub workflow's hashing take `*rust-toolchain.toml` into account, to allow for a future split between the toolchain for compiling c2rust and the toolchain for compiling c2rust-generated code that needs nightly.
1 parent 347969a commit f52bfd9

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.github/workflows/internal-testsuite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
~/.rustup/toolchains
4040
~/.rustup/update-hashes
4141
~/.rustup/settings.toml
42-
key: ${{ runner.os }}-rust-toolchain-${{ hashFiles('rust-toolchain') }}
42+
key: ${{ runner.os }}-rust-toolchain-${{ hashFiles('**/*rust-toolchain.toml') }}
4343

4444
- name: Cache Rust artifacts
4545
uses: actions/cache@v4

analysis/tests/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
*.bc
2-
rust-toolchain
2+
# Sometimes generated by c2rust
3+
rust-toolchain.toml
34

45
instrument.out.log
56
instrument.err.jsonl

tests/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ c2rust-lib.rs
1919
!build.rs
2020

2121
# sometimes generated by `c2rust`
22-
rust-toolchain
22+
rust-toolchain.toml
2323

2424
# sometimes generated by `c2rust`, but only in `src/`
2525
**/src/Cargo.toml

0 commit comments

Comments
 (0)