Skip to content

Commit c3c0a26

Browse files
ref(dif): Rename ToAssemble trait
1 parent 1ca5259 commit c3c0a26

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

src/utils/dif_upload.rs

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,19 +273,24 @@ impl AsRef<[u8]> for DifMatch<'_> {
273273
}
274274
}
275275

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<'_>;
278284
}
279285

280-
impl ToAssemble for Chunked<DifMatch<'_>> {
281-
/// Creates a tuple which can be collected into a `ChunkedDifRequest`.
286+
impl IntoAssembleRequest for Chunked<DifMatch<'_>> {
282287
// Some(...) for debug_id can only be done if the ChunkedUploadCapability::Pdbs is
283288
// present, which is kind of a protocol bug. Not supplying it means more recent
284289
// sentry-cli versions keep working with ancient versions of sentry by not
285290
// triggering this protocol bug in most common situations.
286291
// See: https://github.com/getsentry/sentry-cli/issues/980
287292
// 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<'_> {
289294
(
290295
self.checksum(),
291296
ChunkedDifRequest {
@@ -1218,12 +1223,12 @@ fn try_assemble<'m, T>(
12181223
) -> Result<MissingObjectsInfo<'m, T>>
12191224
where
12201225
T: AsRef<[u8]>,
1221-
Chunked<T>: ToAssemble,
1226+
Chunked<T>: IntoAssembleRequest,
12221227
{
12231228
let api = Api::current();
12241229
let request = objects
12251230
.iter()
1226-
.map(|d| d.to_assemble(options.pdbs_allowed))
1231+
.map(|d| d.assemble_request(options.pdbs_allowed))
12271232
.collect();
12281233
let response = api
12291234
.authenticated()?
@@ -1374,7 +1379,7 @@ fn poll_dif_assemble(
13741379

13751380
let request = difs
13761381
.iter()
1377-
.map(|d| d.to_assemble(options.pdbs_allowed))
1382+
.map(|d| d.assemble_request(options.pdbs_allowed))
13781383
.collect();
13791384
let response = loop {
13801385
let response =

0 commit comments

Comments
 (0)