refactor(decompression-plz): renamed try_decompress_chain to try_decompress_chain_first and try_decompress_chain_remaining to try_decompress_chain_continue

Author: darkseid-is

decompression-plz/src/decompression/dstruct.rs

@@ -120,7 +120,7 @@ impl<'a> DecompressionStruct<'a> {
         let chained =
             Cursor::new(self.main).chain(Cursor::new(self.extra.unwrap()));
         let len = self.len() as u64;
-        let result = Self::try_decompress_chain(
+        let result = Self::try_decompress_chain_first(
             chained,
             &mut self.writer,
             &last_encoding,
@@ -132,14 +132,14 @@ impl<'a> DecompressionStruct<'a> {
         }
         let output = self.writer.get_mut().split();
         if !self.is_encodings_empty() {
-            self.try_decompress_chain_remaining(output, last_encoding)
+            self.try_decompress_chain_continue(output, last_encoding)
         } else {
             self.push_last_encoding(last_encoding);
             Ok(output)
         }
     }
 
-    fn try_decompress_chain(
+    fn try_decompress_chain_first(
         mut input: std::io::Chain<Cursor<&[u8]>, Cursor<&[u8]>>,
         mut writer: &mut Writer<&mut BytesMut>,
         content_encoding: &ContentEncoding,
@@ -162,7 +162,7 @@ impl<'a> DecompressionStruct<'a> {
         Ok(())
     }
 
-    fn try_decompress_chain_remaining(
+    fn try_decompress_chain_continue(
         &mut self,
         input: BytesMut,
         last_encoding: ContentEncoding,
@@ -468,7 +468,7 @@ mod tests {
         }
     }
 
-    // try_decompress_remaining
+    // try_decompress_continue
     #[track_caller]
     fn assert_dstruct_d_main_extra_partial_err(
         main: &[u8],

decompression-plz/src/decompression/mod.rs

@@ -1,4 +1,3 @@
-
 pub mod magic_bytes;
 
 pub mod dstruct;

decompression-plz/src/decompression/multi/mod.rs

@@ -1,4 +1,3 @@
-
 use bytes::{BytesMut, buf::Writer};
 use header_plz::body_headers::encoding_info::EncodingInfo;
 
@@ -85,11 +84,13 @@ mod tests {
         let input = all_compressed_data();
         let mut buf = BytesMut::new();
         let mut writer = (&mut buf).writer();
-        let einfo_list = [EncodingInfo::new(0, vec![ContentEncoding::Brotli]),
+        let einfo_list = [
+            EncodingInfo::new(0, vec![ContentEncoding::Brotli]),
             EncodingInfo::new(1, vec![ContentEncoding::Deflate]),
             EncodingInfo::new(2, vec![ContentEncoding::Gzip]),
             EncodingInfo::new(3, vec![ContentEncoding::Zstd]),
-            EncodingInfo::new(4, vec![ContentEncoding::Identity])];
+            EncodingInfo::new(4, vec![ContentEncoding::Identity]),
+        ];
 
         let result =
             decompress_multi(&input, &mut writer, &mut einfo_list.iter())
@@ -102,7 +103,8 @@ mod tests {
         let input = all_compressed_data();
         let mut buf = BytesMut::new();
         let mut writer = (&mut buf).writer();
-        let einfo_list = [EncodingInfo::new(
+        let einfo_list = [
+            EncodingInfo::new(
                 0,
                 vec![ContentEncoding::Brotli, ContentEncoding::Deflate],
             ),
@@ -113,7 +115,8 @@ mod tests {
             EncodingInfo::new(
                 3,
                 vec![ContentEncoding::Zstd, ContentEncoding::Identity],
-            )];
+            ),
+        ];
 
         let result =
             decompress_multi(&input, &mut writer, &mut einfo_list.iter())
@@ -181,8 +184,10 @@ mod tests {
         let input = compress_brotli(INPUT);
         let mut buf = BytesMut::new();
         let mut writer = (&mut buf).writer();
-        let einfo_list = [EncodingInfo::new(0, vec![ContentEncoding::Zstd]),
-            EncodingInfo::new(4, vec![ContentEncoding::Brotli])];
+        let einfo_list = [
+            EncodingInfo::new(0, vec![ContentEncoding::Zstd]),
+            EncodingInfo::new(4, vec![ContentEncoding::Brotli]),
+        ];
         let result =
             decompress_multi(&input, &mut writer, &mut einfo_list.iter())
                 .unwrap_err();
@@ -203,12 +208,14 @@ mod tests {
         let input = all_compressed_data();
         let mut buf = BytesMut::new();
         let mut writer = (&mut buf).writer();
-        let einfo_list = [EncodingInfo::new(0, vec![ContentEncoding::Brotli]),
+        let einfo_list = [
+            EncodingInfo::new(0, vec![ContentEncoding::Brotli]),
             EncodingInfo::new(1, vec![ContentEncoding::Brotli]),
             EncodingInfo::new(2, vec![ContentEncoding::Deflate]),
             EncodingInfo::new(3, vec![ContentEncoding::Gzip]),
             EncodingInfo::new(4, vec![ContentEncoding::Zstd]),
-            EncodingInfo::new(5, vec![ContentEncoding::Identity])];
+            EncodingInfo::new(5, vec![ContentEncoding::Identity]),
+        ];
         let result =
             decompress_multi(&input, &mut writer, &mut einfo_list.iter())
                 .unwrap_err();
@@ -228,8 +235,7 @@ mod tests {
     fn test_decompress_multi_error_corrupt_single_header() {
         let mut buf = BytesMut::new();
         let mut writer = (&mut buf).writer();
-        let einfo_list =
-            [EncodingInfo::new(0, vec![ContentEncoding::Zstd])];
+        let einfo_list = [EncodingInfo::new(0, vec![ContentEncoding::Zstd])];
         let result =
             decompress_multi(INPUT, &mut writer, &mut einfo_list.iter())
                 .unwrap_err();
@@ -240,8 +246,10 @@ mod tests {
     fn test_decompress_multi_error_corrupt_multi_header() {
         let mut buf = BytesMut::new();
         let mut writer = (&mut buf).writer();
-        let einfo_list = [EncodingInfo::new(0, vec![ContentEncoding::Zstd]),
-            EncodingInfo::new(4, vec![ContentEncoding::Brotli])];
+        let einfo_list = [
+            EncodingInfo::new(0, vec![ContentEncoding::Zstd]),
+            EncodingInfo::new(4, vec![ContentEncoding::Brotli]),
+        ];
 
         let result =
             decompress_multi(INPUT, &mut writer, &mut einfo_list.iter())

decompression-plz/src/decompression/state.rs

@@ -144,6 +144,7 @@ impl<'a> DecompressionState<'a> {
                             main_plus_extra_decompressed,
                         )
                     }
+                    // what if partially decompressed
                     Err(_) => DecompressionState::ExtraRawMainTry(
                         decompression_struct,
                     ),