From 6dc46b3a1c4d96c754e0bb2bce3cb2e39697beb1 Mon Sep 17 00:00:00 2001 From: Conrad Ludgate Date: Wed, 26 May 2021 20:08:02 +0100 Subject: [PATCH] update take --- src/arrayvec.rs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/arrayvec.rs b/src/arrayvec.rs index ef391f0..ed310ab 100644 --- a/src/arrayvec.rs +++ b/src/arrayvec.rs @@ -646,17 +646,8 @@ impl ArrayVec { array } - pub fn take(&mut self) -> Option<[T; CAP]> { - if self.len() < self.capacity() { - None - } else { - unsafe { Some(self.take_unchecked()) } - } - } - - pub unsafe fn take_unchecked(&mut self) -> [T; CAP] { - let data = std::mem::replace(self, Self::new()); - data.into_inner_unchecked() + pub fn take(&mut self) -> Self { + mem::replace(self, Self::new()) } /// Return a slice containing all elements of the vector.