Skip to content

Commit 3f16ac4

Browse files
authored
Merge pull request rustls#142 from paolobarbolini/no-futures-util
Remove futures-util
2 parents 5a30ca5 + fdff008 commit 3f16ac4

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ repository = "https://github.com/ctz/hyper-rustls"
1212
[dependencies]
1313
log = "0.4.4"
1414
ct-logs = { version = "^0.8", optional = true }
15-
futures-util = "0.3.1"
1615
hyper = { version = "0.14", default-features = false, features = ["client", "http1"] }
1716
rustls = "0.19"
1817
rustls-native-certs = { version = "0.5.0", optional = true }
@@ -25,6 +24,7 @@ webpki-roots = { version = "0.21", optional = true }
2524
async-stream = "0.3.0"
2625
tokio = { version = "1.0", features = ["io-std", "macros", "net", "rt-multi-thread"] }
2726
hyper = { version = "0.14", features = ["full"] }
27+
futures-util = { version = "0.3.1", default-features = false }
2828

2929
[features]
3030
default = ["native-tokio"]

src/connector.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use futures_util::FutureExt;
21
#[cfg(feature = "tokio-runtime")]
32
use hyper::client::connect::HttpConnector;
43
use hyper::{client::connect::Connection, service::Service, Uri};
@@ -119,7 +118,7 @@ where
119118

120119
Ok(MaybeHttpsStream::Http(tcp))
121120
};
122-
f.boxed()
121+
Box::pin(f)
123122
} else {
124123
let cfg = self.tls_config.clone();
125124
let hostname = dst.host().unwrap_or_default().to_string();
@@ -136,7 +135,7 @@ where
136135
.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
137136
Ok(MaybeHttpsStream::Https(tls))
138137
};
139-
f.boxed()
138+
Box::pin(f)
140139
}
141140
}
142141
}

0 commit comments

Comments
 (0)