Skip to content

Commit e8bacf2

Browse files
seanmonstarcramertj
authored andcommitted
Remove TokioDefaultSpawner and tokio-compat
1 parent d63ee8e commit e8bacf2

File tree

6 files changed

+1
-80
lines changed

6 files changed

+1
-80
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ matrix:
6262
- name: cargo build (compat feature)
6363
rust: nightly
6464
script:
65-
- cargo build --manifest-path futures/Cargo.toml --features tokio-compat,io-compat
65+
- cargo build --manifest-path futures/Cargo.toml --features io-compat
6666

6767
# Allow build fail until #1396 is fixed.
6868
- name: cargo build --target=thumbv6m-none-eabi

futures-util/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ std = ["futures-core-preview/std", "futures-io-preview/std", "futures-sink-previ
1919
default = ["std", "futures-core-preview/either", "futures-sink-preview/either"]
2020
compat = ["std", "futures_01"]
2121
io-compat = ["compat", "tokio-io"]
22-
tokio-compat = ["compat", "tokio-executor"]
2322
bench = []
2423
nightly = []
2524

@@ -36,7 +35,6 @@ rand = { version = "0.6.4", optional = true }
3635
rand_core = { version = ">=0.2.2, <0.4", optional = true } # See https://github.com/rust-random/rand/issues/645
3736
slab = { version = "0.4", optional = true }
3837
futures_01 = { version = "0.1.25", optional = true, package = "futures" }
39-
tokio-executor = { version = "0.1.2", optional = true }
4038
tokio-io = { version = "0.1.9", optional = true }
4139
pin-utils = "0.1.0-alpha.4"
4240

futures-util/src/compat/mod.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,3 @@ pub use self::compat01as03::{Compat01As03, Future01CompatExt, Stream01CompatExt}
1010

1111
mod compat03as01;
1212
pub use self::compat03as01::Compat;
13-
14-
#[cfg(feature = "tokio-compat")]
15-
mod tokio;
16-
#[cfg(feature = "tokio-compat")]
17-
pub use self::tokio::TokioDefaultSpawner;

futures-util/src/compat/tokio.rs

Lines changed: 0 additions & 68 deletions
This file was deleted.

futures/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,3 @@ std = ["futures-core-preview/std", "futures-executor-preview/std", "futures-io-p
4141
default = ["std"]
4242
compat = ["std", "futures-util-preview/compat"]
4343
io-compat = ["compat", "futures-util-preview/io-compat"]
44-
tokio-compat = ["compat", "futures-util-preview/tokio-compat"]

futures/src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,6 @@ pub mod compat {
8989
Future01CompatExt,
9090
Stream01CompatExt,
9191
};
92-
93-
#[cfg(feature = "tokio-compat")]
94-
pub use futures_util::compat::TokioDefaultSpawner;
9592
}
9693

9794
#[cfg(feature = "std")]

0 commit comments

Comments
 (0)