@@ -166,7 +166,7 @@ impl<C: Config> Client<C> {
166
166
where
167
167
O : DeserializeOwned ,
168
168
{
169
- let request_maker = || async {
169
+ let request_maker = async || {
170
170
Ok ( self
171
171
. http_client
172
172
. get ( self . config . url ( path) )
@@ -184,7 +184,7 @@ impl<C: Config> Client<C> {
184
184
O : DeserializeOwned ,
185
185
Q : Serialize + ?Sized ,
186
186
{
187
- let request_maker = || async {
187
+ let request_maker = async || {
188
188
Ok ( self
189
189
. http_client
190
190
. get ( self . config . url ( path) )
@@ -202,7 +202,7 @@ impl<C: Config> Client<C> {
202
202
where
203
203
O : DeserializeOwned ,
204
204
{
205
- let request_maker = || async {
205
+ let request_maker = async || {
206
206
Ok ( self
207
207
. http_client
208
208
. delete ( self . config . url ( path) )
@@ -216,7 +216,7 @@ impl<C: Config> Client<C> {
216
216
217
217
/// Make a GET request to {path} and return the response body
218
218
pub ( crate ) async fn get_raw ( & self , path : & str ) -> Result < Bytes , OpenAIError > {
219
- let request_maker = || async {
219
+ let request_maker = async || {
220
220
Ok ( self
221
221
. http_client
222
222
. get ( self . config . url ( path) )
@@ -233,7 +233,7 @@ impl<C: Config> Client<C> {
233
233
where
234
234
I : Serialize ,
235
235
{
236
- let request_maker = || async {
236
+ let request_maker = async || {
237
237
Ok ( self
238
238
. http_client
239
239
. post ( self . config . url ( path) )
@@ -252,7 +252,7 @@ impl<C: Config> Client<C> {
252
252
I : Serialize ,
253
253
O : DeserializeOwned ,
254
254
{
255
- let request_maker = || async {
255
+ let request_maker = async || {
256
256
Ok ( self
257
257
. http_client
258
258
. post ( self . config . url ( path) )
@@ -271,7 +271,7 @@ impl<C: Config> Client<C> {
271
271
Form : AsyncTryFrom < F , Error = OpenAIError > ,
272
272
F : Clone ,
273
273
{
274
- let request_maker = || async {
274
+ let request_maker = async || {
275
275
Ok ( self
276
276
. http_client
277
277
. post ( self . config . url ( path) )
@@ -291,7 +291,7 @@ impl<C: Config> Client<C> {
291
291
Form : AsyncTryFrom < F , Error = OpenAIError > ,
292
292
F : Clone ,
293
293
{
294
- let request_maker = || async {
294
+ let request_maker = async || {
295
295
Ok ( self
296
296
. http_client
297
297
. post ( self . config . url ( path) )
@@ -309,11 +309,10 @@ impl<C: Config> Client<C> {
309
309
/// request_maker serves one purpose: to be able to create request again
310
310
/// to retry API call after getting rate limited. request_maker is async because
311
311
/// reqwest::multipart::Form is created by async calls to read files for uploads.
312
- async fn execute_raw < M , Fut > ( & self , request_maker : M ) -> Result < Bytes , OpenAIError >
313
- where
314
- M : Fn ( ) -> Fut ,
315
- Fut : future:: Future < Output = Result < reqwest:: Request , OpenAIError > > ,
316
- {
312
+ async fn execute_raw (
313
+ & self ,
314
+ request_maker : impl AsyncFn ( ) -> Result < reqwest:: Request , OpenAIError > ,
315
+ ) -> Result < Bytes , OpenAIError > {
317
316
let client = self . http_client . clone ( ) ;
318
317
319
318
let request = request_maker ( ) . await ?;
@@ -351,11 +350,12 @@ impl<C: Config> Client<C> {
351
350
/// request_maker serves one purpose: to be able to create request again
352
351
/// to retry API call after getting rate limited. request_maker is async because
353
352
/// reqwest::multipart::Form is created by async calls to read files for uploads.
354
- async fn execute < O , M , Fut > ( & self , request_maker : M ) -> Result < O , OpenAIError >
353
+ async fn execute < O > (
354
+ & self ,
355
+ request_maker : impl AsyncFn ( ) -> Result < reqwest:: Request , OpenAIError > ,
356
+ ) -> Result < O , OpenAIError >
355
357
where
356
358
O : DeserializeOwned ,
357
- M : Fn ( ) -> Fut ,
358
- Fut : core:: future:: Future < Output = Result < reqwest:: Request , OpenAIError > > ,
359
359
{
360
360
let bytes = self . execute_raw ( request_maker) . await ?;
361
361
0 commit comments