Skip to content

Commit b04e162

Browse files
authored
build(deps): remove redundant futures-core dep (#774)
1 parent b109eb9 commit b04e162

5 files changed

Lines changed: 10 additions & 9 deletions

File tree

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ tokio = { version = "1", default-features = false, features = ["net","time","rt"
8484
atomic-waker = "1.1.2"
8585
futures-channel = "0.3.31"
8686
futures-util = { version = "0.3.31", default-features = false }
87-
http2 = { version = "0.5.3", features = ["unstable"]}
87+
http2 = { version = "0.5.4", features = ["unstable"]}
8888
http-body-util = "0.1"
8989
httparse = "1.9"
9090
pin-project-lite = "0.2.4"

src/client/response.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ impl Response {
344344
/// This requires the optional `stream` feature to be enabled.
345345
#[cfg(feature = "stream")]
346346
#[cfg_attr(docsrs, doc(cfg(feature = "stream")))]
347-
pub fn bytes_stream(self) -> impl futures_core::Stream<Item = crate::Result<Bytes>> {
347+
pub fn bytes_stream(self) -> impl futures_util::Stream<Item = crate::Result<Bytes>> {
348348
super::body::DataStream(self.res.into_body())
349349
}
350350

src/core/body/incoming.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::{
77

88
use bytes::Bytes;
99
use futures_channel::{mpsc, oneshot};
10-
use futures_core::{Stream, stream::FusedStream};
10+
use futures_util::{Stream, stream::FusedStream};
1111
use http::HeaderMap;
1212
use http_body::{Body, Frame, SizeHint};
1313

src/core/client/mod.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ use crate::{
4040
conn::TrySendError as ConnTrySendError,
4141
connect::{Alpn, Connect, Connected, Connection, TcpConnectOptions},
4242
},
43-
common::{Exec, Lazy, lazy as hyper_lazy, timer},
43+
common::{Exec, Lazy, lazy, timer},
4444
error::BoxError,
4545
ext::{
4646
RequestConfig, RequestHttpVersionPref, RequestProxyMatcher, RequestTcpConnectOptions,
@@ -589,7 +589,7 @@ where
589589
};
590590
let is_ver_h2 = ver == Ver::Http2;
591591
let connector = self.connector.clone();
592-
hyper_lazy(move || {
592+
lazy(move || {
593593
// Try to take a "connecting lock".
594594
//
595595
// If the pool_key is for HTTP/2, and there is already a
@@ -599,8 +599,7 @@ where
599599
Some(lock) => lock,
600600
None => {
601601
let canceled = e!(Canceled);
602-
// TODO
603-
//crate::Error::new_canceled().with("HTTP/2 connection in progress");
602+
// HTTP/2 connection in progress.
604603
return Either::Right(future::err(canceled));
605604
}
606605
};
@@ -1094,7 +1093,6 @@ fn is_schema_secure(uri: &Uri) -> bool {
10941093
/// # }
10951094
/// # fn main() {}
10961095
/// ```
1097-
#[cfg_attr(docsrs, doc(cfg(any(feature = "http1", feature = "http2"))))]
10981096
#[derive(Clone)]
10991097
pub struct Builder {
11001098
client_config: Config,

src/core/proto/h2/client.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ use futures_channel::{
1313
mpsc::{Receiver, Sender},
1414
oneshot,
1515
};
16-
use futures_core::{FusedFuture, FusedStream, Stream};
16+
use futures_util::{
17+
future::FusedFuture,
18+
stream::{FusedStream, Stream},
19+
};
1720
use http::{Method, Request, Response, StatusCode};
1821
use http_body::Body;
1922
use http2::{

0 commit comments

Comments
 (0)