Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ tokio = { version = "1", default-features = false, features = ["net","time","rt"
atomic-waker = "1.1.2"
futures-channel = "0.3.31"
futures-util = { version = "0.3.31", default-features = false }
http2 = { version = "0.5.3", features = ["unstable"]}
http2 = { version = "0.5.4", features = ["unstable"]}
http-body-util = "0.1"
httparse = "1.9"
pin-project-lite = "0.2.4"
Expand Down
2 changes: 1 addition & 1 deletion src/client/response.rs
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ impl Response {
/// This requires the optional `stream` feature to be enabled.
#[cfg(feature = "stream")]
#[cfg_attr(docsrs, doc(cfg(feature = "stream")))]
pub fn bytes_stream(self) -> impl futures_core::Stream<Item = crate::Result<Bytes>> {
pub fn bytes_stream(self) -> impl futures_util::Stream<Item = crate::Result<Bytes>> {
super::body::DataStream(self.res.into_body())
}

Expand Down
2 changes: 1 addition & 1 deletion src/core/body/incoming.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::{

use bytes::Bytes;
use futures_channel::{mpsc, oneshot};
use futures_core::{Stream, stream::FusedStream};
use futures_util::{Stream, stream::FusedStream};
use http::HeaderMap;
use http_body::{Body, Frame, SizeHint};

Expand Down
8 changes: 3 additions & 5 deletions src/core/client/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ use crate::{
conn::TrySendError as ConnTrySendError,
connect::{Alpn, Connect, Connected, Connection, TcpConnectOptions},
},
common::{Exec, Lazy, lazy as hyper_lazy, timer},
common::{Exec, Lazy, lazy, timer},
error::BoxError,
ext::{
RequestConfig, RequestHttpVersionPref, RequestProxyMatcher, RequestTcpConnectOptions,
Expand Down Expand Up @@ -589,7 +589,7 @@ where
};
let is_ver_h2 = ver == Ver::Http2;
let connector = self.connector.clone();
hyper_lazy(move || {
lazy(move || {
// Try to take a "connecting lock".
//
// If the pool_key is for HTTP/2, and there is already a
Expand All @@ -599,8 +599,7 @@ where
Some(lock) => lock,
None => {
let canceled = e!(Canceled);
// TODO
//crate::Error::new_canceled().with("HTTP/2 connection in progress");
// HTTP/2 connection in progress.
return Either::Right(future::err(canceled));
}
};
Expand Down Expand Up @@ -1094,7 +1093,6 @@ fn is_schema_secure(uri: &Uri) -> bool {
/// # }
/// # fn main() {}
/// ```
#[cfg_attr(docsrs, doc(cfg(any(feature = "http1", feature = "http2"))))]
#[derive(Clone)]
pub struct Builder {
client_config: Config,
Expand Down
5 changes: 4 additions & 1 deletion src/core/proto/h2/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ use futures_channel::{
mpsc::{Receiver, Sender},
oneshot,
};
use futures_core::{FusedFuture, FusedStream, Stream};
use futures_util::{
future::FusedFuture,
stream::{FusedStream, Stream},
};
use http::{Method, Request, Response, StatusCode};
use http_body::Body;
use http2::{
Expand Down
Loading