diff --git a/.vscode/settings.json b/.vscode/settings.json index e20461eb81..df1ff82620 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,7 +3,7 @@ "editor.defaultFormatter": "rust-lang.rust-analyzer", "editor.formatOnSave": true, "rust-analyzer.server.extraEnv": { - "RUSTUP_TOOLCHAIN": "nightly-2024-07-08" + "RUSTUP_TOOLCHAIN": "nightly-2024-10-09" }, "rust-analyzer.check.allTargets": false, } diff --git a/doc/Getting_Started.md b/doc/Getting_Started.md index ca691ce6d0..515304f50c 100644 --- a/doc/Getting_Started.md +++ b/doc/Getting_Started.md @@ -72,7 +72,7 @@ of installing some of these tools, but you can also install them yourself. #### Rust (nightly) -We are using `nightly-2024-07-08`. We require +We are using `nightly-2024-10-09`. We require installing it with [rustup](http://www.rustup.rs) so you can manage multiple versions of Rust and continue using stable versions for other Rust code: @@ -87,7 +87,7 @@ to your `$PATH`. Then install the correct nightly version of Rust: ```bash -$ rustup install nightly-2024-07-08 +$ rustup install nightly-2024-10-09 ``` ### Compiling the Kernel diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 00dded2f96..ca14224c8d 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -3,6 +3,6 @@ # Copyright Tock Contributors 2023. [toolchain] -channel = "nightly-2024-07-08" +channel = "nightly-2024-10-09" components = ["miri", "llvm-tools", "rust-src", "rustfmt", "clippy", "rust-analyzer"] targets = ["thumbv6m-none-eabi", "thumbv7em-none-eabi", "thumbv7em-none-eabihf", "riscv32imc-unknown-none-elf", "riscv32imac-unknown-none-elf"] diff --git a/tools/netlify-build.sh b/tools/netlify-build.sh index 22abdc8405..ea587aef84 100755 --- a/tools/netlify-build.sh +++ b/tools/netlify-build.sh @@ -17,7 +17,7 @@ set -u set -x # Install rust stuff that we need -curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2024-07-08 +curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2024-10-09 # And fixup path for the newly installed rust stuff export PATH="$PATH:$HOME/.cargo/bin"