Update Rust toolchain to 1.85.0, edition to 2024

Signed-off-by: Tim Crawford <tcrawford@system76.com>

CHANGELOG.md

@@ -8,6 +8,10 @@ features apply to your model and firmware version, see the
 
 ## unreleased
 
+- Updated Rust toolchain to 1.85.0
+
+## 2025-02-04
+
 - Enabled boot timeout control via UEFI variable "Timeout"
 - Updated Intel microcode to microcode-20241112
 - meer9: Enabled NPU device

apps/firmware-setup

@@ -1 +1 @@
-Subproject commit 67d63a79b32e107d7c4527133c1d9a946649f145
+Subproject commit cc6f8715574891625984ac8913ade80d1797d4ff

apps/firmware-update

@@ -1 +1 @@
-Subproject commit 9f9032c8f43e759179b62106f49da336b878206f
+Subproject commit 8156eb789d8c3ee3c52200cd88b83a99f8d618c6

apps/gop-policy

@@ -1 +1 @@
-Subproject commit b636a594c1ca75a98df75ce94349b58a45973816
+Subproject commit b6136b4331e85f715f3c9604e0a5bda9ce6fd8fa

containers/firmware-open/Containerfile

@@ -11,7 +11,7 @@ ARG SDCC_REPO="https://svn.code.sf.net/p/sdcc/code"
 ARG SDCC_REV="14648"
 ARG SDCC_VERSION="4.4.0"
 
-ARG RUST_TOOLCHAIN="nightly-2024-05-11"
+ARG RUST_TOOLCHAIN="1.85.0"
 
 # Build coreboot toolchains
 FROM ${CONTAINER_IMAGE} as crossgcc-build

ec

@@ -1 +1 @@
-Subproject commit 8ba926fd4efa920b261f4e9a8a5ae14a9a839a4c
+Subproject commit d15bc38de8e2c5eb28e2231701f56199385b6d65

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2024-05-11"
+channel = "1.85.0"
 components = ["clippy", "rustfmt"]
 profile = "minimal"

scripts/install-rust.sh

@@ -19,9 +19,7 @@ if ! command -v rustup >/dev/null 2>&1; then
     . "${HOME}/.cargo/env"
 fi
 
-# XXX: rustup has no command to install a toolchain from a TOML file.
-# Rely on the fact that `show` will install the default toolchain.
-rustup show
+rustup show active-toolchain || rustup toolchain install
 
 if [ "$RUSTUP_NEW_INSTALL" = "1" ]; then
     printf "\e[33m>> rustup was just installed. Ensure cargo is on the PATH with:\e[0m\n"