Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 93cf365

Browse files
committedMay 8, 2025·
Avoid exporting panic_unwind as stdlib cargo feature
There is already panic-unwind to enable it.
1 parent 86963ca commit 93cf365

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed
 

‎library/std/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ backtrace = [
9393
'miniz_oxide/rustc-dep-of-std',
9494
]
9595

96-
panic-unwind = ["panic_unwind"]
96+
panic-unwind = ["dep:panic_unwind"]
9797
compiler-builtins-c = ["alloc/compiler-builtins-c"]
9898
compiler-builtins-mem = ["alloc/compiler-builtins-mem"]
9999
compiler-builtins-no-asm = ["alloc/compiler-builtins-no-asm"]

‎library/sysroot/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ debug_typeid = ["std/debug_typeid"]
2626
llvm-libunwind = ["std/llvm-libunwind"]
2727
system-llvm-libunwind = ["std/system-llvm-libunwind"]
2828
optimize_for_size = ["std/optimize_for_size"]
29-
panic-unwind = ["std/panic_unwind"]
29+
panic-unwind = ["std/panic-unwind"]
3030
panic_immediate_abort = ["std/panic_immediate_abort"]
3131
profiler = ["dep:profiler_builtins"]
3232
std_detect_file_io = ["std/std_detect_file_io"]

‎src/tools/miri/cargo-miri/src/setup.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ pub fn setup(
8585
SysrootConfig::NoStd
8686
} else {
8787
SysrootConfig::WithStd {
88-
std_features: ["panic_unwind", "backtrace"].into_iter().map(Into::into).collect(),
88+
std_features: ["panic-unwind", "backtrace"].into_iter().map(Into::into).collect(),
8989
}
9090
};
9191
let cargo_cmd = {

0 commit comments

Comments
 (0)
Please sign in to comment.