aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2025-03-16 22:24:36 +0000
committerGitHub <[email protected]>2025-03-16 22:24:36 +0000
commit9d672c44d1dccaac039c656bc2986c4fcf9823c9 (patch)
treecbe7f1c40d9320b1057d650c54356b28553042e0
parent86572bf009c341ea7dc64f478b970175ea6dbb2f (diff)
parent59370cde280ea7e86821b430b4adb22a7343315c (diff)
Merge pull request #3963 from embassy-rs/update-rust-3982
Update Rust stable, nightly.
-rwxr-xr-xci-nightly.sh2
-rw-r--r--rust-toolchain-nightly.toml2
-rw-r--r--rust-toolchain.toml2
3 files changed, 3 insertions, 3 deletions
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 \
22 --- build --release --manifest-path embassy-executor/Cargo.toml --target riscv32imac-unknown-none-elf --features nightly,arch-riscv32,executor-thread \ 22 --- build --release --manifest-path embassy-executor/Cargo.toml --target riscv32imac-unknown-none-elf --features nightly,arch-riscv32,executor-thread \
23 --- build --release --manifest-path examples/nrf52840-rtic/Cargo.toml --target thumbv7em-none-eabi --artifact-dir out/examples/nrf52840-rtic \ 23 --- build --release --manifest-path examples/nrf52840-rtic/Cargo.toml --target thumbv7em-none-eabi --artifact-dir out/examples/nrf52840-rtic \
24 24
25cargo 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 25RUSTFLAGS="$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
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 @@
1[toolchain] 1[toolchain]
2channel = "nightly-2025-02-17" 2channel = "nightly-2025-03-12"
3components = [ "rust-src", "rustfmt", "llvm-tools", "miri" ] 3components = [ "rust-src", "rustfmt", "llvm-tools", "miri" ]
4targets = [ 4targets = [
5 "thumbv7em-none-eabi", 5 "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 @@
1[toolchain] 1[toolchain]
2channel = "1.84" 2channel = "1.85"
3components = [ "rust-src", "rustfmt", "llvm-tools" ] 3components = [ "rust-src", "rustfmt", "llvm-tools" ]
4targets = [ 4targets = [
5 "thumbv7em-none-eabi", 5 "thumbv7em-none-eabi",