From cc2382b9b9fa30c37ba7eefe74bdc5fdeab79000 Mon Sep 17 00:00:00 2001 From: Robert Booth Date: Thu, 22 Apr 2021 07:08:16 +0900 Subject: [PATCH] inline code from and remove save_unconsumed_input method --- vm/src/stdlib/zlib.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/vm/src/stdlib/zlib.rs b/vm/src/stdlib/zlib.rs index 06cdb6959..fd3637538 100644 --- a/vm/src/stdlib/zlib.rs +++ b/vm/src/stdlib/zlib.rs @@ -480,11 +480,6 @@ mod decl { const CHUNKSIZE: usize = u32::MAX as usize; impl CompressInner { - fn save_unconsumed_input(&mut self, data: &[u8], cur_in: usize) { - let leftover = &data[cur_in..]; - self.unconsumed.extend_from_slice(leftover); - } - fn compress(&mut self, data: &[u8], vm: &VirtualMachine) -> PyResult> { let orig_in = self.compress.total_in() as usize; let mut cur_in = 0; @@ -498,7 +493,7 @@ mod decl { .compress .compress_vec(&chunk[cur_in..], &mut buf, FlushCompress::None) .map_err(|_| { - self.save_unconsumed_input(data, cur_in); + self.unconsumed.extend_from_slice(&data[cur_in..]); new_zlib_error("error while compressing", vm) })?; cur_in = (self.compress.total_in() as usize) - orig_in; @@ -509,7 +504,7 @@ mod decl { } } } - self.save_unconsumed_input(data, cur_in); + self.unconsumed.extend_from_slice(&data[cur_in..]); buf.shrink_to_fit(); Ok(buf)