Skip to content

Commit a697837

Browse files
committed
add Compat to main lib
1 parent e0c8dc3 commit a697837

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

futures/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ futures-util-preview = { path = "../futures-util", version = "0.3.0-alpha.2", de
3636
nightly = ["futures-util-preview/nightly"]
3737
std = ["futures-core-preview/std", "futures-executor-preview/std", "futures-io-preview/std", "futures-sink-preview/std", "futures-util-preview/std"]
3838
default = ["std"]
39+
compat = ["std", "futures-util-preview/compat"]

futures/src/lib.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,19 @@ pub mod channel {
7979
pub use futures_channel::{oneshot, mpsc};
8080
}
8181

82+
#[cfg(feature = "compat")]
83+
pub mod compat {
84+
//! Interop between `futures` 0.1 and 0.3.
85+
//!
86+
87+
pub use futures_util::compat::{
88+
Compat, CompatExecutor,
89+
ExecutorFuture01,
90+
Executor01CompatExt,
91+
Future01Ext,
92+
};
93+
}
94+
8295
#[cfg(feature = "std")]
8396
pub mod executor {
8497
//! Task execution.

0 commit comments

Comments
 (0)