@@ -13,13 +13,15 @@ use std::io;
13
13
use std:: str:: FromStr ;
14
14
use std:: sync:: Arc ;
15
15
16
+ type HyperRequest = hyper:: Request < hyper:: Body > ;
17
+
16
18
// Avoid leaking Hyper generics into HttpClient by hiding it behind a dynamic trait object pointer.
17
19
trait HyperClientObject : Debug + Send + Sync + ' static {
18
20
fn dyn_request ( & self , req : hyper:: Request < hyper:: Body > ) -> hyper:: client:: ResponseFuture ;
19
21
}
20
22
21
23
impl < C : Clone + Connect + Debug + Send + Sync + ' static > HyperClientObject for hyper:: Client < C > {
22
- fn dyn_request ( & self , req : hyper :: Request < hyper :: Body > ) -> hyper:: client:: ResponseFuture {
24
+ fn dyn_request ( & self , req : HyperRequest ) -> hyper:: client:: ResponseFuture {
23
25
self . request ( req)
24
26
}
25
27
}
@@ -69,9 +71,7 @@ impl HttpClient for HyperClient {
69
71
}
70
72
}
71
73
72
- struct HyperHttpRequest {
73
- inner : hyper:: Request < hyper:: Body > ,
74
- }
74
+ struct HyperHttpRequest ( HyperRequest ) ;
75
75
76
76
impl HyperHttpRequest {
77
77
async fn try_from ( mut value : Request ) -> Result < Self , Error > {
@@ -109,17 +109,15 @@ impl HyperHttpRequest {
109
109
. uri ( uri)
110
110
. body ( body) ?;
111
111
112
- Ok ( HyperHttpRequest { inner : request } )
112
+ Ok ( HyperHttpRequest ( request) )
113
113
}
114
114
115
115
fn into_inner ( self ) -> hyper:: Request < hyper:: Body > {
116
- self . inner
116
+ self . 0
117
117
}
118
118
}
119
119
120
- struct HttpTypesResponse {
121
- inner : Response ,
122
- }
120
+ struct HttpTypesResponse ( Response ) ;
123
121
124
122
impl HttpTypesResponse {
125
123
async fn try_from ( value : hyper:: Response < hyper:: Body > ) -> Result < Self , Error > {
@@ -144,11 +142,11 @@ impl HttpTypesResponse {
144
142
}
145
143
146
144
res. set_body ( body) ;
147
- Ok ( HttpTypesResponse { inner : res } )
145
+ Ok ( HttpTypesResponse ( res) )
148
146
}
149
147
150
148
fn into_inner ( self ) -> Response {
151
- self . inner
149
+ self . 0
152
150
}
153
151
}
154
152
0 commit comments