Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1668,6 +1668,10 @@ impl<T, const N: usize> SmallVec<T, N> {
}

#[inline]
#[deprecated(
since = "2.0.0-alpha.13",
note = "use `TryInto::<[T; N]>::into` instead"
)]
pub fn into_inner(self) -> Result<[T; N], Self> {
if self.len() != N {
Err(self)
Expand Down Expand Up @@ -2689,6 +2693,25 @@ impl<T, const N: usize, const M: usize> From<[T; M]> for SmallVec<T, N> {
}
}

impl<T, const N: usize, const M: usize> TryFrom<SmallVec<T, N>> for [T; M] {
type Error = SmallVec<T, N>;

#[inline]
fn try_from(mut this: SmallVec<T, N>) -> Result<[T; M], SmallVec<T, N>> {
if this.len() != M {
Err(this)
} else {
// SAFETY: we release ownership of the elements we hold
unsafe {
this.set_len(0);
}
let ptr = this.as_ptr() as *const [T; M];
// SAFETY: these elements are initialized since the length was `M`
unsafe { Ok(ptr.read()) }
}
}
}

impl<T, const N: usize> From<Vec<T>> for SmallVec<T, N> {
fn from(array: Vec<T>) -> Self {
Self::from_vec(array)
Expand Down
20 changes: 20 additions & 0 deletions src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -712,6 +712,26 @@ fn test_into_inner() {
assert_eq!(vec.clone().into_inner(), Err(vec));
}

fn test_try_into_array() {
// Inline < capacity
let vec = SmallVec::<u8, 2>::from_iter(0..1);
assert_eq!(<[u8; 0]>::try_from(vec.clone()), Err(vec.clone()));
assert_eq!(<[u8; 1]>::try_from(vec.clone()), Ok([0]));
assert_eq!(<[u8; 2]>::try_from(vec.clone()), Err(vec));

// Inline == capacity
let vec = SmallVec::<u8, 2>::from_iter(0..2);
assert_eq!(<[u8; 1]>::try_from(vec.clone()), Err(vec.clone()));
assert_eq!(<[u8; 2]>::try_from(vec.clone()), Ok([0, 1]));
assert_eq!(<[u8; 3]>::try_from(vec.clone()), Err(vec));

// Heap
let vec = SmallVec::<u8, 2>::from_iter(0..3);
assert_eq!(<[u8; 2]>::try_from(vec.clone()), Err(vec.clone()));
assert_eq!(<[u8; 3]>::try_from(vec.clone()), Ok([0, 1, 2]));
assert_eq!(<[u8; 4]>::try_from(vec.clone()), Err(vec));
}

#[test]
fn test_from_vec() {
let vec = vec![];
Expand Down
Loading