Skip to content

Commit

Permalink
Add rust-toolchain.toml (#129)
Browse files Browse the repository at this point in the history
  • Loading branch information
nuta authored Dec 18, 2021
1 parent a7f436c commit 4e331a4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,12 @@ jobs:
with:
python-version: 3.9

- name: Set up Rust
- name: Show toolchain versions
run: |
rustup override set nightly
rustup component add llvm-tools-preview rust-src clippy
rustup show
rustup --version
rustc --version
cargo --version
- name: Install cargo crates
run: cargo install cargo-binutils rustfilt
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ kernel_symbols := $(kernel_elf:.elf=.symbols)

PROGRESS := printf " \\033[1;96m%8s\\033[0m \\033[1;m%s\\033[0m\\n"
PYTHON3 ?= python3
CARGO ?= cargo +nightly
CARGO ?= cargo
BOCHS ?= bochs
NM ?= rust-nm
READELF ?= readelf
Expand Down
3 changes: 3 additions & 0 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[toolchain]
channel = "nightly-2021-12-04"
components = [ "rustfmt", "clippy", "llvm-tools-preview", "rust-src" ]

0 comments on commit 4e331a4

Please sign in to comment.