From d708982f27c598a9f6779730e5220c6459e04808 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 4 Mar 2019 09:00:52 -0800
Subject: [PATCH] Remove unstable and test feature flags

---
 Cargo.toml            | 2 --
 README.md             | 5 +++--
 benches/append_vec.rs | 3 ++-
 ci/test-bench.sh      | 2 +-
 core/Cargo.toml       | 2 --
 core/src/lib.rs       | 1 -
 fullnode/Cargo.toml   | 1 -
 7 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index bf6329aaf3..e0f2b833b9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,8 +18,6 @@ chacha = ["solana/chacha"]
 cuda = ["solana/cuda"]
 erasure = ["solana/erasure"]
 ipv6 = ["solana/ipv6", "solana-netutil/ipv6"]
-test = ["solana/test"]
-unstable = ["solana/unstable"]
 
 [dev-dependencies]
 bincode = "1.1.2"
diff --git a/README.md b/README.md
index c184d1112c..1f57939796 100644
--- a/README.md
+++ b/README.md
@@ -134,7 +134,8 @@ Edit `ci/testnet-manager.sh`
 Benchmarking
 ---
 
-First install the nightly build of rustc. `cargo bench` requires unstable features:
+First install the nightly build of rustc. `cargo bench` requires use of the
+unstable features only available in the nightly build.
 
 ```bash
 $ rustup install nightly
@@ -143,7 +144,7 @@ $ rustup install nightly
 Run the benchmarks:
 
 ```bash
-$ cargo +nightly bench --features="unstable"
+$ cargo +nightly bench
 ```
 
 Release Process
diff --git a/benches/append_vec.rs b/benches/append_vec.rs
index b50b2027e6..2431a0b7be 100644
--- a/benches/append_vec.rs
+++ b/benches/append_vec.rs
@@ -1,4 +1,5 @@
-#![cfg_attr(feature = "unstable", feature(test))]
+#![feature(test)]
+
 extern crate rand;
 extern crate test;
 
diff --git a/ci/test-bench.sh b/ci/test-bench.sh
index 4e12ca2960..0d715b694b 100755
--- a/ci/test-bench.sh
+++ b/ci/test-bench.sh
@@ -39,7 +39,7 @@ fi
 
 BENCH_FILE=bench_output.log
 BENCH_ARTIFACT=current_bench_results.log
-_ cargo +nightly bench --features=unstable ${V:+--verbose} \
+_ cargo +nightly bench ${V:+--verbose} \
   -- -Z unstable-options --format=json | tee "$BENCH_FILE"
 
 # Run bpf_loader bench with bpf_c feature enabled
diff --git a/core/Cargo.toml b/core/Cargo.toml
index f12672c0d6..caff26b58e 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -18,8 +18,6 @@ chacha = []
 cuda = []
 erasure = []
 ipv6 = ["solana-netutil/ipv6"]
-test = []
-unstable = []
 
 [dependencies]
 bincode = "1.1.2"
diff --git a/core/src/lib.rs b/core/src/lib.rs
index d0a5a8d389..0189b1db11 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -6,7 +6,6 @@
 //! (see [ThinClient](thin_client/struct.ThinClient.html)) to interact with them.
 //!
 
-#![cfg_attr(feature = "unstable", feature(test))]
 pub mod bank_forks;
 pub mod banking_stage;
 pub mod blob_fetch_stage;
diff --git a/fullnode/Cargo.toml b/fullnode/Cargo.toml
index a0c6ad3392..0ab03754fb 100644
--- a/fullnode/Cargo.toml
+++ b/fullnode/Cargo.toml
@@ -28,4 +28,3 @@ chacha = ["solana/chacha"]
 cuda = ["solana/cuda"]
 erasure = ["solana/erasure"]
 ipv6 = ["solana/ipv6"]
-unstable = ["solana/unstable"]