Skip to content

Commit 1ef7e39

Browse files
committed
fix cargo fmt
1 parent d215166 commit 1ef7e39

File tree

1 file changed

+73
-17
lines changed

1 file changed

+73
-17
lines changed

src/encoder/xdelta_encoder.rs

Lines changed: 73 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ impl XdeltaEncoder {
7373
&mut i,
7474
word_hash_offsets,
7575
&mut delta_code,
76-
adler_hash_word
76+
adler_hash_word,
7777
);
7878
} else {
7979
encode_copy_sequence(
@@ -82,7 +82,7 @@ impl XdeltaEncoder {
8282
&mut i,
8383
&mut delta_code,
8484
adler_hash_word,
85-
word_hash_offsets
85+
word_hash_offsets,
8686
)
8787
}
8888
}
@@ -211,7 +211,7 @@ fn encode_copy_sequence(
211211
delta_code: &mut Vec<u8>,
212212
initial_hash: u32,
213213
word_hash_offsets: &HashMap<u32, usize>,
214-
) {
214+
) {
215215
if *i >= chunk_data.len() || !word_hash_offsets.contains_key(&initial_hash) {
216216
return;
217217
}
@@ -242,7 +242,11 @@ fn encode_copy_sequence(
242242
/// * `equal_part_len` - Length of the data to copy (must be ≤ 2^24-1).
243243
/// * `copy_instruction_offset` - Offset in the source data where the matching block begins (must be ≤ 2^24-1).
244244
/// * `delta_code` - Output buffer where the encoded instruction will be appended.
245-
fn encode_copy_instruction(equal_part_len : usize, copy_instruction_offset : usize, delta_code : &mut Vec<u8>) {
245+
fn encode_copy_instruction(
246+
equal_part_len: usize,
247+
copy_instruction_offset: usize,
248+
delta_code: &mut Vec<u8>,
249+
) {
246250
let copy_instruction_len = &equal_part_len.to_ne_bytes()[..3];
247251
let copy_instruction_offset = &copy_instruction_offset.to_ne_bytes()[..3];
248252
delta_code.extend_from_slice(copy_instruction_len);
@@ -263,8 +267,8 @@ fn encode_insert_sequence(
263267
word_hash_offsets: &HashMap<u32, usize>,
264268
delta_code: &mut Vec<u8>,
265269
initial_hash: u32,
266-
) {
267-
if *i >= chunk_data.len() || word_hash_offsets.contains_key(&initial_hash) {
270+
) {
271+
if *i >= chunk_data.len() || word_hash_offsets.contains_key(&initial_hash) {
268272
return;
269273
}
270274

@@ -302,7 +306,7 @@ fn encode_insert_sequence(
302306
/// Maximum length supported is 2^23-1 bytes.
303307
/// * `delta_code` - Output buffer where the encoded instruction will be appended.
304308
/// Must have enough capacity for 3 + insert_data.len() bytes.
305-
fn encode_insert_instruction(insert_data : Vec<u8>, delta_code: &mut Vec<u8>) {
309+
fn encode_insert_instruction(insert_data: Vec<u8>, delta_code: &mut Vec<u8>) {
306310
let len_bytes = &mut (insert_data.len() as u32).to_ne_bytes()[..3];
307311
len_bytes[2] |= 1 << 7;
308312
delta_code.extend_from_slice(len_bytes);
@@ -383,7 +387,13 @@ mod test {
383387
let mut i = 0;
384388

385389
let adler_hash = adler32(&chunk_data[i..i + BLOCK_SIZE]);
386-
encode_insert_sequence(&chunk_data, &mut i, &word_hash_offsets, &mut delta_code, adler_hash);
390+
encode_insert_sequence(
391+
&chunk_data,
392+
&mut i,
393+
&word_hash_offsets,
394+
&mut delta_code,
395+
adler_hash,
396+
);
387397

388398
assert_eq!(i, chunk_data.len());
389399

@@ -402,7 +412,13 @@ mod test {
402412
let mut i = 0;
403413

404414
let adler_hash = 0;
405-
encode_insert_sequence(&chunk_data, &mut i, &word_hash_offsets, &mut delta_code, adler_hash);
415+
encode_insert_sequence(
416+
&chunk_data,
417+
&mut i,
418+
&word_hash_offsets,
419+
&mut delta_code,
420+
adler_hash,
421+
);
406422
assert_eq!(i, chunk_data.len());
407423

408424
let header = &delta_code[..3];
@@ -422,7 +438,13 @@ mod test {
422438
let mut delta_code = Vec::new();
423439
let mut i = 0;
424440

425-
encode_insert_sequence(&chunk_data, &mut i, &word_hash_offsets, &mut delta_code, hash);
441+
encode_insert_sequence(
442+
&chunk_data,
443+
&mut i,
444+
&word_hash_offsets,
445+
&mut delta_code,
446+
hash,
447+
);
426448

427449
assert!(delta_code.is_empty());
428450
assert_eq!(i, 0);
@@ -442,7 +464,13 @@ mod test {
442464
let mut i = 0;
443465

444466
let initial_hash = adler32(&chunk_data[i..i + BLOCK_SIZE]);
445-
encode_insert_sequence(&chunk_data, &mut i, &word_hash_offsets, &mut delta_code, initial_hash);
467+
encode_insert_sequence(
468+
&chunk_data,
469+
&mut i,
470+
&word_hash_offsets,
471+
&mut delta_code,
472+
initial_hash,
473+
);
446474

447475
let mut expected = vec![4, 0, 0x80];
448476
expected.extend_from_slice(&[1, 2, 3, 4]);
@@ -484,9 +512,16 @@ mod test {
484512

485513
let mut i = 0;
486514
let mut delta = vec![];
487-
let hash = adler32(&chunk[i..i+BLOCK_SIZE]);
515+
let hash = adler32(&chunk[i..i + BLOCK_SIZE]);
488516

489-
encode_copy_sequence(&parent, &chunk, &mut i, &mut delta, hash, &word_hash_offsets);
517+
encode_copy_sequence(
518+
&parent,
519+
&chunk,
520+
&mut i,
521+
&mut delta,
522+
hash,
523+
&word_hash_offsets,
524+
);
490525

491526
assert_eq!(i, 24);
492527
assert_eq!(delta[..3], 24u32.to_ne_bytes()[..3]);
@@ -503,7 +538,14 @@ mod test {
503538
let mut i = 0;
504539
let mut delta = vec![];
505540

506-
encode_copy_sequence(&parent, &chunk, &mut i, &mut delta, hash, &word_hash_offsets);
541+
encode_copy_sequence(
542+
&parent,
543+
&chunk,
544+
&mut i,
545+
&mut delta,
546+
hash,
547+
&word_hash_offsets,
548+
);
507549

508550
assert_eq!(i, BLOCK_SIZE);
509551
}
@@ -518,7 +560,14 @@ mod test {
518560
let mut delta = vec![];
519561
let invalid_hash = adler32(b"invalid_block____");
520562

521-
encode_copy_sequence(&parent, &chunk, &mut i, &mut delta, invalid_hash, &word_hash_offsets);
563+
encode_copy_sequence(
564+
&parent,
565+
&chunk,
566+
&mut i,
567+
&mut delta,
568+
invalid_hash,
569+
&word_hash_offsets,
570+
);
522571

523572
assert!(delta.is_empty());
524573
assert_eq!(i, 0);
@@ -534,7 +583,14 @@ mod test {
534583
let mut delta = vec![];
535584
let hash = adler32(&[0; BLOCK_SIZE]);
536585

537-
encode_copy_sequence(&parent, &chunk, &mut i, &mut delta, hash, &word_hash_offsets);
586+
encode_copy_sequence(
587+
&parent,
588+
&chunk,
589+
&mut i,
590+
&mut delta,
591+
hash,
592+
&word_hash_offsets,
593+
);
538594

539595
assert!(delta.is_empty());
540596
assert_eq!(i, chunk.len());
@@ -695,4 +751,4 @@ mod test {
695751
);
696752
(binding, sbc_key_2)
697753
}
698-
}
754+
}

0 commit comments

Comments
 (0)