From a17b1683992b19a7fd4889a6b751ee36fd15395f Mon Sep 17 00:00:00 2001
From: Yusuke Sasaki <yusuke.sasaki.nuem@gmail.com>
Date: Tue, 2 Oct 2018 03:55:14 +0900
Subject: [PATCH] remove feature flags

---
 .travis.yml |  6 +++---
 Cargo.toml  | 11 +++--------
 src/lib.rs  |  7 +++++--
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 28b8be4..d9e520c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ matrix:
         - export CARGO_INCREMENTAL=0
       script:
         - cargo update
-        - cargo test --features "strict"
+        - cargo test
         - cargo fmt -- --check
         - if [[ "${TRAVIS_PULL_REQUEST_BRANCH:-}" = release-* ]]; then cargo publish --dry-run; fi
       after_success:
@@ -46,7 +46,7 @@ matrix:
         - export CARGO_INCREMENTAL=0
       script:
         - cargo update
-        - cargo test --features strict
+        - cargo test
 
     - rust: nightly
       before_script:
@@ -62,7 +62,7 @@ matrix:
         - rm -rf target/doc
         - cargo update
         - cargo doc --no-deps -p tungstenite
-        - cargo doc --no-deps
+        - cargo doc --no-deps --all-features
         - rm -f target/doc/.lock
         - echo '<meta http-equiv="refresh" content="0;URL=finchers_tungstenite/index.html">' > target/doc/index.html
       deploy:
diff --git a/Cargo.toml b/Cargo.toml
index c0cdcff..d4f9e99 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,16 +22,11 @@ include = [
 ]
 
 [package.metadata.docs.rs]
-features = [
-  # FIXME: remove it as soon as the rustc version used in docs.rs is updated.
-  "extern-prelude",
+rustc-args = [
+  # FIXME: remove it as soon as the rustc version used in docs.rs is updated
+  "--cfg", "finchers_inject_extern_prelude",
 ]
 
-[features]
-strict = []
-# FIXME: remove it as soon as the rustc version used in docs.rs is updated
-extern-prelude = []
-
 [dependencies]
 finchers = "0.12"
 
diff --git a/src/lib.rs b/src/lib.rs
index e2a3a72..9b3e5cd 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,3 +1,6 @@
+// FIXME: remove it as soon as the rustc version used in docs.rs is updated
+#![cfg_attr(finchers_inject_extern_prelude, feature(extern_prelude))]
+
 //! WebSocket support for Finchers based on tungstenite.
 //!
 //! # Example
@@ -43,8 +46,8 @@
     unused,
 )]
 //#![warn(rust_2018_compatibility)]
-#![cfg_attr(feature = "strict", deny(warnings))]
-#![cfg_attr(feature = "strict", doc(test(attr(deny(warnings)))))]
+#![cfg_attr(test, deny(warnings))]
+#![cfg_attr(test, doc(test(attr(deny(warnings)))))]
 
 extern crate base64;
 #[macro_use]