From 6cc566645eade9319b02a0ef444bfc4060e128e8 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Wed, 12 Mar 2025 21:07:48 +0100 Subject: [PATCH 1/2] Update Rust stable, nightly. --- rust-toolchain-nightly.toml | 2 +- rust-toolchain.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rust-toolchain-nightly.toml b/rust-toolchain-nightly.toml index 8faa1a073..d803b29a0 100644 --- a/rust-toolchain-nightly.toml +++ b/rust-toolchain-nightly.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2025-02-17" +channel = "nightly-2025-03-12" components = [ "rust-src", "rustfmt", "llvm-tools", "miri" ] targets = [ "thumbv7em-none-eabi", diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 73c97872c..ca5816121 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.84" +channel = "1.85" components = [ "rust-src", "rustfmt", "llvm-tools" ] targets = [ "thumbv7em-none-eabi", From 59370cde280ea7e86821b430b4adb22a7343315c Mon Sep 17 00:00:00 2001 From: sodo Date: Fri, 21 Feb 2025 22:37:58 +0900 Subject: [PATCH 2/2] avr: Change ci-nightly target from `avr-unknown-gnu-atmega328` to `avr-none` Related to: https://github.com/rust-lang/rust/pull/131651 Signed-off-by: sodo --- ci-nightly.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-nightly.sh b/ci-nightly.sh index e48ad2323..c0a2482e7 100755 --- a/ci-nightly.sh +++ b/ci-nightly.sh @@ -22,4 +22,4 @@ cargo batch \ --- build --release --manifest-path embassy-executor/Cargo.toml --target riscv32imac-unknown-none-elf --features nightly,arch-riscv32,executor-thread \ --- build --release --manifest-path examples/nrf52840-rtic/Cargo.toml --target thumbv7em-none-eabi --artifact-dir out/examples/nrf52840-rtic \ -cargo build --release --manifest-path embassy-executor/Cargo.toml --target avr-unknown-gnu-atmega328 -Z build-std=core,alloc --features nightly,arch-avr,avr-device/atmega328p +RUSTFLAGS="$RUSTFLAGS -C target-cpu=atmega328p" cargo build --release --manifest-path embassy-executor/Cargo.toml --target avr-none -Z build-std=core,alloc --features nightly,arch-avr,avr-device/atmega328p