Skip to content

Commit ee60afa

Browse files
committed
Auto merge of #39860 - japaric:san, r=alexcrichton
cleanup: remove the *san Cargo features from std these belong to a previous iteration of the sanitizer implementation r? @alexcrichton cc @whitequark
2 parents f91c3f6 + 28baa27 commit ee60afa

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

src/bootstrap/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ impl Build {
613613
/// Get the space-separated set of activated features for the standard
614614
/// library.
615615
fn std_features(&self) -> String {
616-
let mut features = "panic-unwind asan lsan msan tsan".to_string();
616+
let mut features = "panic-unwind".to_string();
617617

618618
if self.config.debug_jemalloc {
619619
features.push_str(" debug-jemalloc");

src/librustc_asan/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ version = "0.0.0"
77
[lib]
88
name = "rustc_asan"
99
path = "lib.rs"
10+
test = false
1011

1112
[build-dependencies]
1213
build_helper = { path = "../build_helper" }

src/librustc_lsan/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ version = "0.0.0"
77
[lib]
88
name = "rustc_lsan"
99
path = "lib.rs"
10+
test = false
1011

1112
[build-dependencies]
1213
build_helper = { path = "../build_helper" }

src/librustc_msan/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ version = "0.0.0"
77
[lib]
88
name = "rustc_msan"
99
path = "lib.rs"
10+
test = false
1011

1112
[build-dependencies]
1213
build_helper = { path = "../build_helper" }

src/librustc_tsan/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ version = "0.0.0"
77
[lib]
88
name = "rustc_tsan"
99
path = "lib.rs"
10+
test = false
1011

1112
[build-dependencies]
1213
build_helper = { path = "../build_helper" }

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"]

0 commit comments

Comments
 (0)