@@ -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
}
@@ -70,9 +72,7 @@ impl HttpClient for HyperClient {
70
72
}
71
73
}
72
74
73
- struct HyperHttpRequest {
74
- inner : hyper:: Request < hyper:: Body > ,
75
- }
75
+ struct HyperHttpRequest ( HyperRequest ) ;
76
76
77
77
impl HyperHttpRequest {
78
78
async fn try_from ( mut value : Request ) -> Result < Self , Error > {
@@ -110,17 +110,15 @@ impl HyperHttpRequest {
110
110
. uri ( uri)
111
111
. body ( body) ?;
112
112
113
- Ok ( HyperHttpRequest { inner : request } )
113
+ Ok ( HyperHttpRequest ( request) )
114
114
}
115
115
116
116
fn into_inner ( self ) -> hyper:: Request < hyper:: Body > {
117
- self . inner
117
+ self . 0
118
118
}
119
119
}
120
120
121
- struct HttpTypesResponse {
122
- inner : Response ,
123
- }
121
+ struct HttpTypesResponse ( Response ) ;
124
122
125
123
impl HttpTypesResponse {
126
124
async fn try_from ( value : hyper:: Response < hyper:: Body > ) -> Result < Self , Error > {
@@ -145,11 +143,11 @@ impl HttpTypesResponse {
145
143
}
146
144
147
145
res. set_body ( body) ;
148
- Ok ( HttpTypesResponse { inner : res } )
146
+ Ok ( HttpTypesResponse ( res) )
149
147
}
150
148
151
149
fn into_inner ( self ) -> Response {
152
- self . inner
150
+ self . 0
153
151
}
154
152
}
155
153
0 commit comments