Merge pull request #187 from conradludgate/into-inner-take

take and into_inner_unchecked functions
This commit is contained in:
bluss
2021-05-31 23:43:55 +02:00
committed by GitHub
2 changed files with 49 additions and 5 deletions
+25 -5
View File
@@ -636,14 +636,34 @@ impl<T, const CAP: usize> ArrayVec<T, CAP> {
if self.len() < self.capacity() {
Err(self)
} else {
unsafe {
let self_ = ManuallyDrop::new(self);
let array = ptr::read(self_.as_ptr() as *const [T; CAP]);
Ok(array)
}
unsafe { Ok(self.into_inner_unchecked()) }
}
}
/// Return the inner fixed size array.
///
/// Safety:
/// This operation is safe if and only if length equals capacity.
pub unsafe fn into_inner_unchecked(self) -> [T; CAP] {
debug_assert_eq!(self.len(), self.capacity());
let self_ = ManuallyDrop::new(self);
let array = ptr::read(self_.as_ptr() as *const [T; CAP]);
array
}
/// Returns the ArrayVec, replacing the original with a new empty ArrayVec.
///
/// ```
/// use arrayvec::ArrayVec;
///
/// let mut v = ArrayVec::from([0, 1, 2, 3]);
/// assert_eq!([0, 1, 2, 3], v.take().into_inner().unwrap());
/// assert!(v.is_empty());
/// ```
pub fn take(&mut self) -> Self {
mem::replace(self, Self::new())
}
/// Return a slice containing all elements of the vector.
pub fn as_slice(&self) -> &[T] {
ArrayVecImpl::as_slice(self)