@@ -76,6 +76,7 @@ impl<'a> DecompressionStruct<'a> {
7676 if !last. encodings ( ) . is_empty ( ) {
7777 ( 0 , last. encodings ( ) . len ( ) - 1 )
7878 } else if let Some ( last_before) = rest. last ( ) {
79+ // always contains a encoding
7980 ( 1 , last_before. encodings ( ) . len ( ) - 1 )
8081 } else {
8182 ( 0 , 0 )
@@ -437,7 +438,7 @@ mod tests {
437438 // Main + Extra - errors
438439 // try_decompress_chain
439440 #[ test]
440- fn test_dstruct_decompress_main_plus_extra_error_extra_raw_all ( ) {
441+ fn test_dstruct_d_main_plus_extra_err_extra_raw_all ( ) {
441442 for & ( compress_fn, ref encoding) in & [
442443 (
443444 compress_deflate as fn ( & [ u8 ] ) -> Vec < u8 > ,
@@ -468,7 +469,7 @@ mod tests {
468469 }
469470
470471 // try_decompress_remaining
471- fn assert_dstruct_decompress_main_plus_extra_partial_error (
472+ fn assert_dstruct_d_main_plus_extra_partial_error (
472473 main : & [ u8 ] ,
473474 extra : Option < & [ u8 ] > ,
474475 mut encoding_info : Vec < EncodingInfo > ,
@@ -502,14 +503,15 @@ mod tests {
502503 }
503504
504505 #[ test]
505- fn test_dstruct_decompress_main_plus_extra_partial_error_two_values ( ) {
506+ fn test_dstruct_d_main_plus_extra_partial_err_corrupt_to_partial_two_values ( )
507+ {
506508 let compressed = compress_brotli ( INPUT ) ;
507509 let ( first, second) = compressed. split_at ( compressed. len ( ) / 2 ) ;
508510 let encoding_info = vec ! [ EncodingInfo :: new(
509511 0 ,
510512 vec![ ContentEncoding :: Deflate , ContentEncoding :: Brotli ] ,
511513 ) ] ;
512- assert_dstruct_decompress_main_plus_extra_partial_error (
514+ assert_dstruct_d_main_plus_extra_partial_error (
513515 & first,
514516 Some ( & second) ,
515517 encoding_info,
@@ -519,7 +521,8 @@ mod tests {
519521 }
520522
521523 #[ test]
522- fn test_dstruct_decompress_main_plus_extra_partial_error_three_values ( ) {
524+ fn test_dstruct_d_main_plus_extra_partial_err_corrupt_to_partial_three_values ( )
525+ {
523526 let compressed = compress_brotli ( INPUT ) ;
524527 let ( first, second) = compressed. split_at ( compressed. len ( ) / 2 ) ;
525528 let encoding_info = vec ! [ EncodingInfo :: new(
@@ -530,7 +533,7 @@ mod tests {
530533 ContentEncoding :: Brotli ,
531534 ] ,
532535 ) ] ;
533- assert_dstruct_decompress_main_plus_extra_partial_error (
536+ assert_dstruct_d_main_plus_extra_partial_error (
534537 & first,
535538 Some ( & second) ,
536539 encoding_info,
@@ -540,11 +543,12 @@ mod tests {
540543 }
541544
542545 #[ test]
543- fn test_dstruct_decompress_main_plus_extra_partial_error_single_header ( ) {
546+ fn test_dstruct_d_main_plus_extra_partial_err_corrupt_to_partial_single_header ( )
547+ {
544548 let compressed = compress_zstd ( INPUT ) ;
545549 let ( first, second) = compressed. split_at ( compressed. len ( ) / 2 ) ;
546550 let encoding_info = all_encoding_info_single_header ( ) ;
547- assert_dstruct_decompress_main_plus_extra_partial_error (
551+ assert_dstruct_d_main_plus_extra_partial_error (
548552 & first,
549553 Some ( & second) ,
550554 encoding_info,
@@ -554,11 +558,12 @@ mod tests {
554558 }
555559
556560 #[ test]
557- fn test_dstruct_decompress_main_plus_extra_partial_error_multi_header ( ) {
561+ fn test_dstruct_d_main_plus_extra_partial_err_corrupt_to_partial_multi_header ( )
562+ {
558563 let compressed = compress_zstd ( INPUT ) ;
559564 let ( first, second) = compressed. split_at ( compressed. len ( ) / 2 ) ;
560565 let encoding_info = all_encoding_info_multi_header ( ) ;
561- assert_dstruct_decompress_main_plus_extra_partial_error (
566+ assert_dstruct_d_main_plus_extra_partial_error (
562567 & first,
563568 Some ( & second) ,
564569 encoding_info,
0 commit comments