From 382b2c7a8f1609b653fc9c7ab8f190163031b1fc Mon Sep 17 00:00:00 2001 From: Victor Koenders Date: Sun, 24 Oct 2021 18:06:16 +0200 Subject: [PATCH] Fixed clippy lint, removed function that was only used in 1 place --- src/de/impls.rs | 1 - src/de/read.rs | 17 ++++++----------- src/enc/write.rs | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/de/impls.rs b/src/de/impls.rs index acddebe..4efff04 100644 --- a/src/de/impls.rs +++ b/src/de/impls.rs @@ -413,7 +413,6 @@ where // Safety: we know that T is a u8, so it is perfectly safe to // translate an array of u8 into an array of T let res = unsafe { ptr.read() }; - core::mem::forget(buf); Ok(res) } else { let result = diff --git a/src/de/read.rs b/src/de/read.rs index 228518a..b0f6cc3 100644 --- a/src/de/read.rs +++ b/src/de/read.rs @@ -69,16 +69,6 @@ impl<'storage> SliceReader<'storage> { pub fn new(bytes: &'storage [u8]) -> SliceReader<'storage> { SliceReader { slice: bytes } } - - #[inline(always)] - fn get_byte_slice(&mut self, length: usize) -> Result<&'storage [u8], DecodeError> { - if length > self.slice.len() { - return Err(DecodeError::UnexpectedEnd); - } - let (read_slice, remaining) = self.slice.split_at(length); - self.slice = remaining; - Ok(read_slice) - } } impl<'storage> Reader for SliceReader<'storage> { @@ -108,6 +98,11 @@ impl<'storage> Reader for SliceReader<'storage> { impl<'storage> BorrowReader<'storage> for SliceReader<'storage> { #[inline(always)] fn take_bytes(&mut self, length: usize) -> Result<&'storage [u8], DecodeError> { - self.get_byte_slice(length) + if length > self.slice.len() { + return Err(DecodeError::UnexpectedEnd); + } + let (read_slice, remaining) = self.slice.split_at(length); + self.slice = remaining; + Ok(read_slice) } } diff --git a/src/enc/write.rs b/src/enc/write.rs index dc57096..7618830 100644 --- a/src/enc/write.rs +++ b/src/enc/write.rs @@ -52,7 +52,7 @@ impl<'storage> Writer for SliceWriter<'storage> { return Err(EncodeError::UnexpectedEnd); } let (a, b) = core::mem::replace(&mut self.slice, &mut []).split_at_mut(bytes.len()); - a.copy_from_slice(&bytes[..]); + a.copy_from_slice(bytes); self.slice = b; Ok(())