From d22891eb3ef50c30e5ac8b5f891ffaa0963963b7 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaricious@gmail.com>
Date: Wed, 15 Feb 2017 17:00:41 -0500
Subject: [PATCH] cleanup: remove the *san Cargo features from std

these belong to a previous iteration of the sanitizer implementation
---
 src/bootstrap/lib.rs          |  2 +-
 src/libstd/Cargo.toml         | 12 ++++--------
 src/rustc/std_shim/Cargo.toml |  4 ----
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 7bd611eb53e3c..218a9fa732087 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -602,7 +602,7 @@ impl Build {
     /// Get the space-separated set of activated features for the standard
     /// library.
     fn std_features(&self) -> String {
-        let mut features = "panic-unwind asan lsan msan tsan".to_string();
+        let mut features = "panic-unwind".to_string();
 
         if self.config.debug_jemalloc {
             features.push_str(" debug-jemalloc");
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index 2ba7517d3d202..46511452a7237 100644
--- a/src/libstd/Cargo.toml
+++ b/src/libstd/Cargo.toml
@@ -24,22 +24,18 @@ std_unicode = { path = "../libstd_unicode" }
 unwind = { path = "../libunwind" }
 
 [target.x86_64-unknown-linux-gnu.dependencies]
-rustc_asan = { path = "../librustc_asan", optional = true }
-rustc_lsan = { path = "../librustc_lsan", optional = true }
-rustc_msan = { path = "../librustc_msan", optional = true }
-rustc_tsan = { path = "../librustc_tsan", optional = true }
+rustc_asan = { path = "../librustc_asan" }
+rustc_lsan = { path = "../librustc_lsan" }
+rustc_msan = { path = "../librustc_msan" }
+rustc_tsan = { path = "../librustc_tsan" }
 
 [build-dependencies]
 build_helper = { path = "../build_helper" }
 gcc = "0.3.27"
 
 [features]
-asan = ["rustc_asan"]
 backtrace = []
 debug-jemalloc = ["alloc_jemalloc/debug"]
 jemalloc = ["alloc_jemalloc"]
 force_alloc_system = []
-lsan = ["rustc_lsan"]
-msan = ["rustc_msan"]
 panic-unwind = ["panic_unwind"]
-tsan = ["rustc_tsan"]
diff --git a/src/rustc/std_shim/Cargo.toml b/src/rustc/std_shim/Cargo.toml
index db96079d3e916..14c9c5544b188 100644
--- a/src/rustc/std_shim/Cargo.toml
+++ b/src/rustc/std_shim/Cargo.toml
@@ -35,12 +35,8 @@ core = { path = "../../libcore" }
 
 # Reexport features from std
 [features]
-asan = ["std/asan"]
 backtrace = ["std/backtrace"]
 debug-jemalloc = ["std/debug-jemalloc"]
 jemalloc = ["std/jemalloc"]
 force_alloc_system = ["std/force_alloc_system"]
-lsan = ["std/lsan"]
-msan = ["std/msan"]
 panic-unwind = ["std/panic-unwind"]
-tsan = ["std/tsan"]