forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(client): change Connect trait into an alias for Service

Browse Source 
The `Connect` trait is now essentially an alias for
`Service<Destination>`, with a blanket implementation as such, and is
sealed.

Closes #1902

BREAKING CHANGE: Any manual implementations of `Connect` must instead
  implement `tower::Service<Destination>`.
This commit is contained in:
Sean McArthur
2019-10-21 17:26:21 -07:00
parent 4f2743991c
commit d67e49f149
6 changed files with 256 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/client.rs
View File

@@ -939,7 +939,7 @@ mod dispatch_impl {
use tokio_io::{AsyncRead, AsyncWrite};
use tokio_net::tcp::TcpStream;
use hyper::client::connect::{Connect, Connected, Destination, HttpConnector};
use hyper::client::connect::{Connected, Destination, HttpConnector};
use hyper::Client;
#[test]
@@ -1688,6 +1688,7 @@ mod dispatch_impl {
}
#[derive(Clone)]
struct DebugConnector {
http: HttpConnector,
closes: mpsc::Sender<()>,
@@ -1719,19 +1720,24 @@ mod dispatch_impl {
}
}
impl Connect for DebugConnector {
type Transport = DebugStream;
impl hyper::service::Service<Destination> for DebugConnector {
type Response = (DebugStream, Connected);
type Error = io::Error;
type Future = Pin<Box<dyn Future<
Output = Result<(DebugStream, Connected), io::Error>
Output = Result<Self::Response, Self::Error>
> + Send>>;
fn connect(&self, dst: Destination) -> Self::Future {
fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
// don't forget to check inner service is ready :)
hyper::service::Service::<Destination>::poll_ready(&mut self.http, cx)
}
fn call(&mut self, dst: Destination) -> Self::Future {
self.connects.fetch_add(1, Ordering::SeqCst);
let closes = self.closes.clone();
let is_proxy = self.is_proxy;
let is_alpn_h2 = self.alpn_h2;
Box::pin(self.http.connect(dst).map_ok(move |(s, mut c)| {
Box::pin(self.http.call(dst).map_ok(move |(s, mut c)| {
if is_alpn_h2 {
c = c.negotiated_h2();
}