Skip to content

Commit f054e54

Browse files
authored
chore(proxy/api-resolve): remove Default bounds (#3656)
see linkerd/linkerd2#8733 for more information. see also, #3651 #3653, and #3654 for some related pull requests. in hyper 1.x, `Incoming` bodies do not provide a `Default` implementation. compare the trait implementations here: * https://docs.rs/hyper/0.14.31/hyper/body/struct.Body.html#impl-Default-for-Body * https://docs.rs/hyper/latest/hyper/body/struct.Incoming.html#trait-implementations this commit removes `Default` bounds from `Resolve<S>`. this means that in `linkerd-app`, we can invoke `new_recover_default()` when using hyper 1.x (_see #3504_) Signed-off-by: katelyn martin <[email protected]>
1 parent 09a0c0f commit f054e54

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

linkerd/proxy/api-resolve/src/resolve.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl<S> Resolve<S>
2424
where
2525
S: GrpcService<BoxBody> + Clone + Send + 'static,
2626
S::Error: Into<Error> + Send,
27-
S::ResponseBody: Default + Body<Data = tonic::codegen::Bytes> + Send + 'static,
27+
S::ResponseBody: Body<Data = tonic::codegen::Bytes> + Send + 'static,
2828
<S::ResponseBody as Body>::Error: Into<Error> + Send,
2929
S::Future: Send,
3030
{
@@ -48,7 +48,7 @@ where
4848
T: Param<ConcreteAddr>,
4949
S: GrpcService<BoxBody> + Clone + Send + 'static,
5050
S::Error: Into<Error> + Send,
51-
S::ResponseBody: Default + Body<Data = tonic::codegen::Bytes> + Send + 'static,
51+
S::ResponseBody: Body<Data = tonic::codegen::Bytes> + Send + 'static,
5252
<S::ResponseBody as Body>::Error: Into<Error> + Send,
5353
S::Future: Send,
5454
{

0 commit comments

Comments
 (0)