Skip to content

Commit

Permalink
use stable rust by default
Browse files Browse the repository at this point in the history
Only use nightly for miri.
  • Loading branch information
bradjc committed Aug 23, 2023
1 parent 20a1b8b commit dfde4c4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 20 deletions.
20 changes: 4 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,8 @@ endif
.PHONY: setup
setup: setup-qemu
rustup install stable
cargo +stable install elf2tab
cargo miri setup
rustup target add --toolchain stable thumbv7em-none-eabi
cargo install elf2tab
cargo +nightly miri setup

# Sets up QEMU in the tock/ directory. We use Tock's QEMU which may contain
# patches to better support boards that Tock supports.
Expand Down Expand Up @@ -108,19 +107,8 @@ EXCLUDE_STD := --exclude libtock_unittest --exclude print_sizes \
--exclude runner --exclude syscalls_tests \
--exclude libtock_build_scripts

# Currently, all of our crates should build with a stable toolchain. This
# verifies our crates don't depend on unstable features by using cargo check. We
# specify a different target directory so this doesn't flush the cargo cache of
# the primary toolchain.
.PHONY: test-stable
test-stable:
cargo +stable check --target-dir=target/stable --workspace \
$(EXCLUDE_RUNTIME)
LIBTOCK_PLATFORM=nrf52 cargo +stable check $(EXCLUDE_STD) \
--target=thumbv7em-none-eabi --target-dir=target/stable --workspace

.PHONY: test
test: examples test-stable
test: examples
cargo test $(EXCLUDE_RUNTIME) --workspace
LIBTOCK_PLATFORM=nrf52 cargo fmt --all -- --check
cargo clippy --all-targets $(EXCLUDE_RUNTIME) --workspace
Expand All @@ -129,7 +117,7 @@ test: examples test-stable
LIBTOCK_PLATFORM=hifive1 cargo clippy $(EXCLUDE_STD) \
--target=riscv32imac-unknown-none-elf --workspace
MIRIFLAGS="-Zmiri-strict-provenance -Zmiri-symbolic-alignment-check" \
cargo miri test $(EXCLUDE_MIRI) --workspace
cargo +nightly miri test $(EXCLUDE_MIRI) --workspace
echo '[ SUCCESS ] libtock-rs tests pass'

# Helper functions to define make targets to build for specific (flash, ram,
Expand Down
6 changes: 2 additions & 4 deletions rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
[toolchain]
# See https://rust-lang.github.io/rustup-components-history/ for a list of
# recently nightlies and what components are available for them.
channel = "nightly-2023-08-22"
components = ["clippy", "miri", "rustfmt"]
channel = "stable"
components = ["clippy", "rustfmt"]
targets = ["thumbv6m-none-eabi",
"thumbv7em-none-eabi",
"riscv32imac-unknown-none-elf",
Expand Down

0 comments on commit dfde4c4

Please sign in to comment.