diff options
Diffstat (limited to 'vendor/zerovec/src/flexzerovec/slice.rs')
| -rw-r--r-- | vendor/zerovec/src/flexzerovec/slice.rs | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/vendor/zerovec/src/flexzerovec/slice.rs b/vendor/zerovec/src/flexzerovec/slice.rs index fb58d6215..41cb7116f 100644 --- a/vendor/zerovec/src/flexzerovec/slice.rs +++ b/vendor/zerovec/src/flexzerovec/slice.rs @@ -134,18 +134,18 @@ impl FlexZeroSlice { // equal to the length of the `data` field, which will be one less than the length of the // overall array. #[allow(clippy::panic)] // panic is documented in function contract - let (_, remainder) = match bytes.split_last() { - Some(v) => v, - None => panic!("slice should be non-empty"), - }; - &*(remainder as *const [u8] as *const Self) + if bytes.is_empty() { + panic!("from_byte_slice_unchecked called with empty slice") + } + let slice = core::ptr::slice_from_raw_parts(bytes.as_ptr(), bytes.len() - 1); + &*(slice as *const Self) } #[inline] pub(crate) unsafe fn from_byte_slice_mut_unchecked(bytes: &mut [u8]) -> &mut Self { // Safety: See comments in `from_byte_slice_unchecked` - let remainder = core::slice::from_raw_parts_mut(bytes.as_mut_ptr(), bytes.len() - 1); - &mut *(remainder as *mut [u8] as *mut Self) + let remainder = core::ptr::slice_from_raw_parts_mut(bytes.as_mut_ptr(), bytes.len() - 1); + &mut *(remainder as *mut Self) } /// Returns this slice as its underlying `&[u8]` byte buffer representation. @@ -298,8 +298,7 @@ impl FlexZeroSlice { /// assert_eq!(pairs_it.next(), None); /// ``` pub fn iter_pairs(&self) -> impl Iterator<Item = (usize, Option<usize>)> + '_ { - self.iter() - .zip(self.iter().skip(1).map(Some).chain(core::iter::once(None))) + self.iter().zip(self.iter().skip(1).map(Some).chain([None])) } /// Creates a `Vec<usize>` from a [`FlexZeroSlice`] (or `FlexZeroVec`). |