Skip to content

Commit 6808a15

Browse files
committed
Remove StreamSink01Compat and changed compat for sink to compat_sink
1 parent d09da28 commit 6808a15

File tree

3 files changed

+2
-21
lines changed

3 files changed

+2
-21
lines changed

futures-util/src/compat/compat01as03.rs

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ pub trait Sink01CompatExt: Sink01 {
7676
/// [`Sink<SinkItem = T, SinkError = E>`](futures::sink::Sink)
7777
/// into a futures 0.3
7878
/// [`Sink<SinkItem = T, SinkError = E>`](futures_sink::sink::Sink).
79-
fn compat(self) -> Compat01As03Sink<Self, Self::SinkItem>
79+
fn compat_sink(self) -> Compat01As03Sink<Self, Self::SinkItem>
8080
where
8181
Self: Sized,
8282
{
@@ -85,24 +85,6 @@ pub trait Sink01CompatExt: Sink01 {
8585
}
8686
impl<Si: Sink01> Sink01CompatExt for Si {}
8787

88-
/// Extension trait for futures 0.1 [`Stream`](futures::stream::Stream) and
89-
/// [`Sink`](futures::sink::Sink) combos
90-
pub trait StreamSink01CompatExt: Stream01 + Sink01 {
91-
/// Converts a futures 0.1
92-
/// [`Stream<Item = T, Error = E`](futures::stream::Stream) +
93-
/// [`Sink<SinkItem = T, SinkError = E>`](futures::sink::Sink)
94-
/// into a futures 0.3
95-
/// [`Stream<Item = T, Error = E>`](futures_core::stream::Stream) +
96-
/// [`Sink<SinkItem = T, SinkError = E>`](futures_sink::sink::Sink).
97-
fn compat(self) -> Compat01As03Sink<Self, <Self as Sink01>::SinkItem>
98-
where
99-
Self: Sized,
100-
{
101-
Compat01As03Sink::new(self)
102-
}
103-
}
104-
impl<S: Stream01 + Sink01> StreamSink01CompatExt for S {}
105-
10688
fn poll_01_to_03<T, E>(x: Result<Async01<T>, E>) -> task03::Poll<Result<T, E>> {
10789
match x {
10890
Ok(Async01::Ready(t)) => task03::Poll::Ready(Ok(t)),

futures-util/src/compat/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ mod executor;
66
pub use self::executor::{Executor01CompatExt, Executor01Future, Executor01As03};
77

88
mod compat01as03;
9-
pub use self::compat01as03::{Compat01As03, Future01CompatExt, Stream01CompatExt, Sink01CompatExt, StreamSink01CompatExt};
9+
pub use self::compat01as03::{Compat01As03, Future01CompatExt, Stream01CompatExt, Sink01CompatExt};
1010

1111
mod compat03as01;
1212
pub use self::compat03as01::Compat;

futures/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ pub mod compat {
8989
Future01CompatExt,
9090
Stream01CompatExt,
9191
Sink01CompatExt,
92-
StreamSink01CompatExt,
9392
};
9493

9594
#[cfg(feature = "tokio-compat")]

0 commit comments

Comments
 (0)