Make the test delay a RUSTFLAGS instead of exposed feature

.travis.yml

@@ -13,11 +13,12 @@ script:
   - cargo build
   - cargo test
   # Adding an extra delay in some places in the code. Makes the tests hit other edge cases.
-  - cargo test --features test-delay
+  - RUSTFLAGS="--cfg oneshot_test_delay" cargo test
   - LOOM_MAX_BRANCHES=100000 LOOM_LOG=1 RUSTFLAGS="--cfg loom" cargo test
   - if [[ $(uname -s) == "Linux" ]]; then
       cargo install cargo-valgrind;
       ./check_mem_leaks.sh;
+      RUSTFLAGS="--cfg oneshot_test_delay" ./check_mem_leaks.sh;
     fi
   - if [[ "${TRAVIS_RUST_VERSION}" = "stable" && $(uname -s) == "Linux" ]]; then
       rustup component add rustfmt-preview;

Cargo.toml

@@ -16,9 +16,6 @@ edition = "2018"
 loom = "0.3.2"
 criterion = "0.3"
 
-[features]
-test-delay = []
-
 [[bench]]
 name = "benches"
 harness = false

check_mem_leaks.sh

@@ -10,5 +10,4 @@ for example_path in examples/*.rs; do
     example=${example_filename%.*}
     echo $example
     cargo valgrind --example "$example"
-    cargo valgrind --features test-delay --example "$example"
 done

src/lib.rs

@@ -133,7 +133,7 @@ impl<T> Receiver<T> {
             // Conditionally add a delay here to help the tests trigger the edge cases where
             // the sender manages to be dropped or send something before we are able to store our
             // `Thread` object in the state.
-            #[cfg(feature = "test-delay")]
+            #[cfg(oneshot_test_delay)]
             std::thread::sleep(std::time::Duration::from_millis(10));
 
             // Allocate and put our thread instance on the heap and then store it in the state.
@@ -195,7 +195,7 @@ impl<T> Receiver<T> {
             // Conditionally add a delay here to help the tests trigger the edge cases where
             // the sender manages to be dropped or send something before we are able to store our
             // `Thread` object in the state.
-            #[cfg(feature = "test-delay")]
+            #[cfg(oneshot_test_delay)]
             std::thread::sleep(std::time::Duration::from_millis(10));
 
             // Allocate and put our thread instance on the heap and then store it in the state.
@@ -291,7 +291,7 @@ impl<T> Receiver<T> {
             // Conditionally add a delay here to help the tests trigger the edge cases where
             // the sender manages to be dropped or send something before we are able to store our
             // `Thread` object in the state.
-            #[cfg(feature = "test-delay")]
+            #[cfg(oneshot_test_delay)]
             std::thread::sleep(std::time::Duration::from_millis(10));
 
             // Allocate and put our thread instance on the heap and then store it in the state.