Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ xtask = "run --manifest-path=crates/xtask/Cargo.toml --"

[build]
target-dir = "target"

[unstable]
panic-immediate-abort = true
Comment thread
ia0 marked this conversation as resolved.
2 changes: 1 addition & 1 deletion crates/api/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,4 @@

## 0.1.0

<!-- Increment to skip CHANGELOG.md test: 0 -->
<!-- Increment to skip CHANGELOG.md test: 1 -->
2 changes: 1 addition & 1 deletion crates/api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#![no_std]
#![cfg_attr(all(feature = "wasm", feature = "native"), feature(linkage))]
#![cfg_attr(feature = "host", feature(never_type))]
#![feature(doc_auto_cfg)]
#![feature(doc_cfg)]

extern crate alloc;

Expand Down
2 changes: 1 addition & 1 deletion crates/board/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,4 +211,4 @@

## 0.1.0

<!-- Increment to skip CHANGELOG.md test: 1 -->
<!-- Increment to skip CHANGELOG.md test: 2 -->
2 changes: 1 addition & 1 deletion crates/board/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
//! support triggering [events][Event].

#![no_std]
#![feature(doc_auto_cfg)]
#![feature(doc_cfg)]
#![feature(never_type)]

extern crate alloc;
Expand Down
1 change: 1 addition & 0 deletions crates/cli-tools/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Minor

- Use the `immediate-abort` panic strategy instead of `build-std-features`
- Test in `changelog::execute_ci()` that skip counter is zero for releases

### Patch
Expand Down
5 changes: 2 additions & 3 deletions crates/cli-tools/src/action.rs
Original file line number Diff line number Diff line change
Expand Up @@ -714,11 +714,10 @@ impl RustAppletBuild {
cargo.arg("-Zbuild-std=core,alloc");
// TODO(https://github.com/rust-lang/rust/issues/122105): Remove when fixed.
rustflags.push("--allow=unused-crate-dependencies".to_string());
let mut features = "-Zbuild-std-features=panic_immediate_abort".to_string();
if self.opt_level.is_some_and(OptLevel::optimize_for_size) {
features.push_str(",optimize_for_size");
cargo.arg("-Zbuild-std-features=optimize_for_size");
}
cargo.arg(features);
cargo.arg(format!("--config=profile.{profile}.panic=\"immediate-abort\""));
} else {
cargo.env("WASEFIRE_DEBUG", "");
}
Expand Down
3 changes: 1 addition & 2 deletions crates/cli-tools/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
//! This library is also used for the internal maintenance CLI of Wasefire called xtask.

#![feature(async_fn_track_caller)]
#![feature(doc_auto_cfg)]
#![feature(doc_cfg)]
#![feature(never_type)]
#![feature(path_add_extension)]
#![feature(try_blocks)]
#![feature(try_find)]

Expand Down
2 changes: 1 addition & 1 deletion crates/prelude/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,4 +215,4 @@

## 0.1.0

<!-- Increment to skip CHANGELOG.md test: 1 -->
<!-- Increment to skip CHANGELOG.md test: 2 -->
2 changes: 1 addition & 1 deletion crates/prelude/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#![no_std]
#![feature(alloc_error_handler)]
#![feature(doc_auto_cfg)]
#![feature(doc_cfg)]
#![feature(macro_metavar_expr)]
#![feature(maybe_uninit_array_assume_init)]
#![feature(negative_impls)]
Expand Down
2 changes: 1 addition & 1 deletion crates/protocol/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@

## 0.1.0

<!-- Increment to skip CHANGELOG.md test: 1 -->
<!-- Increment to skip CHANGELOG.md test: 2 -->
2 changes: 1 addition & 1 deletion crates/protocol/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
//! and cancel the request it was processing if any.

#![no_std]
#![feature(doc_auto_cfg)]
#![feature(doc_cfg)]
#![feature(macro_metavar_expr)]
#![feature(never_type)]

Expand Down
2 changes: 1 addition & 1 deletion crates/wire/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@

## 0.1.0

<!-- Increment to skip CHANGELOG.md test: 1 -->
<!-- Increment to skip CHANGELOG.md test: 2 -->
2 changes: 1 addition & 1 deletion crates/wire/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#![no_std]
#![feature(array_try_from_fn)]
#![feature(doc_auto_cfg)]
#![feature(doc_cfg)]
#![feature(never_type)]
#![feature(try_blocks)]

Expand Down
7 changes: 3 additions & 4 deletions crates/xtask/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -736,13 +736,12 @@ impl RunnerOptions {
cargo.arg("-Zbuild-std=core,alloc");
// TODO(https://github.com/rust-lang/rust/issues/122105): Remove when fixed.
rustflags.push("--allow=unused-crate-dependencies".to_string());
let mut features = "-Zbuild-std-features=panic_immediate_abort".to_string();
if self.opt_level.is_some_and(action::OptLevel::optimize_for_size) {
features.push_str(",optimize_for_size");
cargo.arg("-Zbuild-std-features=optimize_for_size");
}
cargo.arg(features);
cargo.arg("--config=profile.release.codegen-units=1");
cargo.arg("--config=profile.release.lto=true");
cargo.arg("--config=profile.release.panic=\"immediate-abort\"");
Comment thread
ia0 marked this conversation as resolved.
} else {
cargo.arg("--config=profile.release.debug=2");
rustflags.push("-C link-arg=-Tdefmt.x".to_string());
Expand Down Expand Up @@ -930,7 +929,7 @@ impl RunnerOptions {
if self.single_sided {
cargo.arg("--features=single-sided");
}
cargo.args(["-Zbuild-std=core", "-Zbuild-std-features=panic_immediate_abort"]);
cargo.args(["-Zbuild-std=core", "--config=profile.release.panic=\"immediate-abort\""]);
Comment thread
ia0 marked this conversation as resolved.
// TODO(https://github.com/rust-lang/rust/issues/122105): Remove when fixed.
cargo.env("RUSTFLAGS", "--allow=unused-crate-dependencies");
cmd::execute(&mut cargo).await?;
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "nightly-2025-09-02"
channel = "nightly-2025-10-07"
components = ["clippy", "llvm-tools", "miri", "rust-src", "rustfmt"]
targets = [
"i686-unknown-linux-gnu",
Expand Down