From 7a2b5db15cc86ed69fb2c9e3796d2caa4affae9c Mon Sep 17 00:00:00 2001
From: Carl Lerche <me@carllerche.com>
Date: Wed, 2 May 2018 10:48:58 -0700
Subject: [PATCH] Remove `futures2` feature from Cargo.toml files (#334)

Currently, the state of the futures2 integration is pretty broken. This
patch removes the feature flag, preventing users from trying to use it.
In the future, it can be brought back when the implementation is fixed.
---
 Cargo.toml                  | 17 -----------------
 tokio-executor/Cargo.toml   |  7 -------
 tokio-reactor/Cargo.toml    | 10 ----------
 tokio-tcp/Cargo.toml        | 10 ----------
 tokio-threadpool/Cargo.toml | 10 ----------
 tokio-udp/Cargo.toml        | 10 ----------
 6 files changed, 64 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6cac0bcdd..8790d71bb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,9 +51,6 @@ futures = "0.1.20"
 # Needed until `reactor` is removed from `tokio`.
 mio = "0.6.14"
 
-# Futures 0.2 integration
-futures2 = { version = "0.1.0", path = "futures2", optional = true }
-
 [dev-dependencies]
 bytes = "0.4"
 env_logger = { version = "0.4", default-features = false }
@@ -67,17 +64,3 @@ serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 time = "0.1"
-
-[patch.crates-io]
-tokio-io = { path = "tokio-io" }
-
-[features]
-unstable-futures = [
-    "futures2",
-    "tokio-reactor/unstable-futures",
-    "tokio-threadpool/unstable-futures",
-    "tokio-executor/unstable-futures",
-    "tokio-tcp/unstable-futures",
-    "tokio-udp/unstable-futures"
-]
-default = []
diff --git a/tokio-executor/Cargo.toml b/tokio-executor/Cargo.toml
index cc783a0a6..e73ff5cb0 100644
--- a/tokio-executor/Cargo.toml
+++ b/tokio-executor/Cargo.toml
@@ -19,10 +19,3 @@ categories = ["concurrency", "asynchronous"]
 
 [dependencies]
 futures = "0.1.19"
-
-# Futures 0.2 integration
-futures2 = { version = "0.1.0", path = "../futures2", optional = true }
-
-[features]
-unstable-futures = ["futures2"]
-default = []
diff --git a/tokio-reactor/Cargo.toml b/tokio-reactor/Cargo.toml
index 9d7cabf48..47080f626 100644
--- a/tokio-reactor/Cargo.toml
+++ b/tokio-reactor/Cargo.toml
@@ -24,13 +24,3 @@ mio = "0.6.14"
 slab = "0.4.0"
 tokio-executor = { version = "0.1.1", path = "../tokio-executor" }
 tokio-io = { version = "0.1.6", path = "../tokio-io" }
-
-# Futures 0.2 integration
-futures2 = { version = "0.1", path = "../futures2", optional = true }
-
-[features]
-unstable-futures = [
-  "futures2",
-  "tokio-executor/unstable-futures",
-]
-default = []
diff --git a/tokio-tcp/Cargo.toml b/tokio-tcp/Cargo.toml
index b8706737e..06783cc1d 100644
--- a/tokio-tcp/Cargo.toml
+++ b/tokio-tcp/Cargo.toml
@@ -24,15 +24,5 @@ mio = "0.6.14"
 iovec = "0.1"
 futures = "0.1.19"
 
-# Futures 0.2 integration
-futures2 = { version = "0.1", path = "../futures2", optional = true }
-
 [dev-dependencies]
 env_logger = { version = "0.4", default-features = false }
-
-[features]
-unstable-futures = [
-  "futures2",
-  "tokio-reactor/unstable-futures",
-]
-default = []
diff --git a/tokio-threadpool/Cargo.toml b/tokio-threadpool/Cargo.toml
index f0e6fd424..701a169f1 100644
--- a/tokio-threadpool/Cargo.toml
+++ b/tokio-threadpool/Cargo.toml
@@ -20,9 +20,6 @@ num_cpus = "1.2"
 rand = "0.4"
 log = "0.4"
 
-# Futures 0.2 integration
-futures2 = { version = "0.1", path = "../futures2", optional = true }
-
 [dev-dependencies]
 tokio-timer = "0.1"
 env_logger = "0.4"
@@ -30,10 +27,3 @@ env_logger = "0.4"
 # For comparison benchmarks
 futures-cpupool = "0.1.7"
 threadpool = "1.7.1"
-
-[features]
-unstable-futures = [
-  "futures2",
-  "tokio-executor/unstable-futures",
-]
-default = []
diff --git a/tokio-udp/Cargo.toml b/tokio-udp/Cargo.toml
index a2bb02c43..5a74c6a6d 100644
--- a/tokio-udp/Cargo.toml
+++ b/tokio-udp/Cargo.toml
@@ -24,15 +24,5 @@ mio = "0.6.14"
 log = "0.4"
 futures = "0.1.19"
 
-# Futures 0.2 integration
-futures2 = { version = "0.1", path = "../futures2", optional = true }
-
 [dev-dependencies]
 env_logger = { version = "0.4", default-features = false }
-
-[features]
-unstable-futures = [
-  "futures2",
-  "tokio-reactor/unstable-futures",
-]
-default = []