@@ -273,19 +273,24 @@ impl AsRef<[u8]> for DifMatch<'_> {
273
273
}
274
274
}
275
275
276
- trait ToAssemble {
277
- fn to_assemble ( & self , with_debug_id : bool ) -> ( Digest , ChunkedDifRequest < ' _ > ) ;
276
+ /// A tuple which can be collected into a mapping of checksums to
277
+ /// `ChunkedDifRequest`s. The collected mapping can be sent in a
278
+ /// request to the assemble endpoint.
279
+ type AssembleRequest < ' a > = ( Digest , ChunkedDifRequest < ' a > ) ;
280
+
281
+ trait IntoAssembleRequest {
282
+ /// Creates an `AssembleRequest` tuple for this object.
283
+ fn assemble_request ( & self , with_debug_id : bool ) -> AssembleRequest < ' _ > ;
278
284
}
279
285
280
- impl ToAssemble for Chunked < DifMatch < ' _ > > {
281
- /// Creates a tuple which can be collected into a `ChunkedDifRequest`.
286
+ impl IntoAssembleRequest for Chunked < DifMatch < ' _ > > {
282
287
// Some(...) for debug_id can only be done if the ChunkedUploadCapability::Pdbs is
283
288
// present, which is kind of a protocol bug. Not supplying it means more recent
284
289
// sentry-cli versions keep working with ancient versions of sentry by not
285
290
// triggering this protocol bug in most common situations.
286
291
// See: https://github.com/getsentry/sentry-cli/issues/980
287
292
// See: https://github.com/getsentry/sentry-cli/issues/1056
288
- fn to_assemble ( & self , with_debug_id : bool ) -> ( Digest , ChunkedDifRequest < ' _ > ) {
293
+ fn assemble_request ( & self , with_debug_id : bool ) -> AssembleRequest < ' _ > {
289
294
(
290
295
self . checksum ( ) ,
291
296
ChunkedDifRequest {
@@ -1218,12 +1223,12 @@ fn try_assemble<'m, T>(
1218
1223
) -> Result < MissingObjectsInfo < ' m , T > >
1219
1224
where
1220
1225
T : AsRef < [ u8 ] > ,
1221
- Chunked < T > : ToAssemble ,
1226
+ Chunked < T > : IntoAssembleRequest ,
1222
1227
{
1223
1228
let api = Api :: current ( ) ;
1224
1229
let request = objects
1225
1230
. iter ( )
1226
- . map ( |d| d. to_assemble ( options. pdbs_allowed ) )
1231
+ . map ( |d| d. assemble_request ( options. pdbs_allowed ) )
1227
1232
. collect ( ) ;
1228
1233
let response = api
1229
1234
. authenticated ( ) ?
@@ -1374,7 +1379,7 @@ fn poll_dif_assemble(
1374
1379
1375
1380
let request = difs
1376
1381
. iter ( )
1377
- . map ( |d| d. to_assemble ( options. pdbs_allowed ) )
1382
+ . map ( |d| d. assemble_request ( options. pdbs_allowed ) )
1378
1383
. collect ( ) ;
1379
1384
let response = loop {
1380
1385
let response =
0 commit comments