Skip to content

Commit d22891e

Browse files
author
Jorge Aparicio
committed
cleanup: remove the *san Cargo features from std
these belong to a previous iteration of the sanitizer implementation
1 parent 62eb605 commit d22891e

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

src/bootstrap/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ impl Build {
602602
/// Get the space-separated set of activated features for the standard
603603
/// library.
604604
fn std_features(&self) -> String {
605-
let mut features = "panic-unwind asan lsan msan tsan".to_string();
605+
let mut features = "panic-unwind".to_string();
606606

607607
if self.config.debug_jemalloc {
608608
features.push_str(" debug-jemalloc");

src/libstd/Cargo.toml

+4-8
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,18 @@ std_unicode = { path = "../libstd_unicode" }
2424
unwind = { path = "../libunwind" }
2525

2626
[target.x86_64-unknown-linux-gnu.dependencies]
27-
rustc_asan = { path = "../librustc_asan", optional = true }
28-
rustc_lsan = { path = "../librustc_lsan", optional = true }
29-
rustc_msan = { path = "../librustc_msan", optional = true }
30-
rustc_tsan = { path = "../librustc_tsan", optional = true }
27+
rustc_asan = { path = "../librustc_asan" }
28+
rustc_lsan = { path = "../librustc_lsan" }
29+
rustc_msan = { path = "../librustc_msan" }
30+
rustc_tsan = { path = "../librustc_tsan" }
3131

3232
[build-dependencies]
3333
build_helper = { path = "../build_helper" }
3434
gcc = "0.3.27"
3535

3636
[features]
37-
asan = ["rustc_asan"]
3837
backtrace = []
3938
debug-jemalloc = ["alloc_jemalloc/debug"]
4039
jemalloc = ["alloc_jemalloc"]
4140
force_alloc_system = []
42-
lsan = ["rustc_lsan"]
43-
msan = ["rustc_msan"]
4441
panic-unwind = ["panic_unwind"]
45-
tsan = ["rustc_tsan"]

src/rustc/std_shim/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,8 @@ core = { path = "../../libcore" }
3535

3636
# Reexport features from std
3737
[features]
38-
asan = ["std/asan"]
3938
backtrace = ["std/backtrace"]
4039
debug-jemalloc = ["std/debug-jemalloc"]
4140
jemalloc = ["std/jemalloc"]
4241
force_alloc_system = ["std/force_alloc_system"]
43-
lsan = ["std/lsan"]
44-
msan = ["std/msan"]
4542
panic-unwind = ["std/panic-unwind"]
46-
tsan = ["std/tsan"]

0 commit comments

Comments
 (0)