From 881832cde942287bc0070320f47ef2127657ebb3 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Tue, 3 Dec 2019 10:38:50 -0800 Subject: [PATCH] Rename unstable-stream feature to stream (#433) --- Cargo.toml | 9 ++++----- src/client.rs | 2 +- src/server.rs | 2 +- src/share.rs | 4 ++-- tests/h2-support/Cargo.toml | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ddb121a..eacb297 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,8 +19,7 @@ edition = "2018" [features] # Enables `futures::Stream` implementations for various types. -# This is an optional feature due to `Stream` not being stable. -unstable-stream = [] +stream = [] # Enables **unstable** APIs. Any API exposed by this feature has no backwards # compatibility guarantees. In other words, you should not use this feature for @@ -38,9 +37,9 @@ members = [ ] [dependencies] -futures-core = "0.3" -futures-sink = "0.3" -futures-util = { version = "0.3", default-features = false, features = [] } +futures-core = { version = "0.3", default-features = false } +futures-sink = { version = "0.3", default-features = false } +futures-util = { version = "0.3", default-features = false } tokio-util = { version = "0.2", features = ["codec"] } tokio = { version = "0.2", features = ["io-util", "sync"] } bytes = "0.5.2" diff --git a/src/client.rs b/src/client.rs index 7eff620..f09b786 100644 --- a/src/client.rs +++ b/src/client.rs @@ -1319,7 +1319,7 @@ impl PushPromises { } } -#[cfg(feature = "unstable-stream")] +#[cfg(feature = "stream")] impl futures_core::Stream for PushPromises { type Item = Result; diff --git a/src/server.rs b/src/server.rs index 3c893b6..e99abe0 100644 --- a/src/server.rs +++ b/src/server.rs @@ -519,7 +519,7 @@ where } } -#[cfg(feature = "unstable-stream")] +#[cfg(feature = "stream")] impl futures_core::Stream for Connection where T: AsyncRead + AsyncWrite + Unpin, diff --git a/src/share.rs b/src/share.rs index de031fe..0629106 100644 --- a/src/share.rs +++ b/src/share.rs @@ -7,7 +7,7 @@ use http::HeaderMap; use crate::PollExt; use std::fmt; -#[cfg(feature = "unstable-stream")] +#[cfg(feature = "stream")] use std::pin::Pin; use std::task::{Context, Poll}; @@ -448,7 +448,7 @@ impl RecvStream { } } -#[cfg(feature = "unstable-stream")] +#[cfg(feature = "stream")] impl futures_core::Stream for RecvStream { type Item = Result; diff --git a/tests/h2-support/Cargo.toml b/tests/h2-support/Cargo.toml index 6d24d59..b48dc36 100644 --- a/tests/h2-support/Cargo.toml +++ b/tests/h2-support/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Carl Lerche "] edition = "2018" [dependencies] -h2 = { path = "../..", features = ["unstable-stream", "unstable"] } +h2 = { path = "../..", features = ["stream", "unstable"] } bytes = "0.5" env_logger = "0.5.9"