-
Notifications
You must be signed in to change notification settings - Fork 105
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Define a MSRV, use that toolchain by default.
This PR defines a Minimum Supported Rust Version. It specifies that toolchain in `rust-toolchain`, so `rustup` will use that toolchain by default. The `test-stable` make action is removed, as it is now redundant. We still need the nightly toolchain for Miri. Instead of specifying the nightly toolchain version via the command line, I created a new `nightly/rust-toolchain.toml` file that specifies the toolchain. The benefit is this makes `rustup` automatically install the nightly toolchain *including Miri*. This should stop the toil we currently have where every time the Rust toolchain is updated, everyone using `make test` has to manually install new toolchains and Miri. The downside is it's kinda ugly. I set the MSRV to 1.70 so this doesn't conflict with #498. I will send another PR that adds `rust-version.workspace = true` to all the `Cargo.toml` files in this repository; I didn't want to clutter this PR with those changes.
- Loading branch information
Showing
6 changed files
with
30 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
/Cargo.lock | ||
/nightly/target | ||
/target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# This is the nightly Rust toolchain used by `make test`. | ||
[toolchain] | ||
channel = "nightly-2023-08-22" | ||
components = ["miri"] |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
[toolchain] | ||
# This is libtock-rs' Minimum Supported Rust Version (MSRV). | ||
# | ||
# Update policy: Update this if doing so allows you to use a Rust feature that | ||
# you'd like to use. When you do so, update this to the first Rust version that | ||
# includes that feature. Whenever this value is updated, the rust-version field | ||
# in Cargo.toml must be updated as well. | ||
channel = "1.70" | ||
components = ["clippy", "rustfmt"] | ||
targets = ["thumbv6m-none-eabi", | ||
"thumbv7em-none-eabi", | ||
"riscv32imac-unknown-none-elf", | ||
"riscv32imc-unknown-none-elf"] |