Skip to content

Commit 16264f8

Browse files
committed
fix: move default rust_std_features to config
1 parent e3a1a59 commit 16264f8

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/bootstrap/src/core/config/config.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2096,7 +2096,8 @@ impl Config {
20962096
);
20972097
}
20982098

2099-
config.rust_std_features = std_features.unwrap_or_default();
2099+
let default_std_features = BTreeSet::from([String::from("panic-unwind")]);
2100+
config.rust_std_features = std_features.unwrap_or(default_std_features);
21002101

21012102
let default = debug == Some(true);
21022103
config.rust_debug_assertions = debug_assertions.unwrap_or(default);

src/bootstrap/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -666,8 +666,6 @@ impl Build {
666666
let mut features: BTreeSet<&str> =
667667
self.config.rust_std_features.iter().map(|s| s.as_str()).collect();
668668

669-
features.insert("panic-unwind");
670-
671669
match self.config.llvm_libunwind(target) {
672670
LlvmLibunwind::InTree => features.insert("llvm-libunwind"),
673671
LlvmLibunwind::System => features.insert("system-llvm-libunwind"),

0 commit comments

Comments
 (0)