Skip to content

Commit 74075e3

Browse files
authored
Implement From<[T; M]> for SmallVec<T, N> for all M, N (v2) (#338)
* Remove T: Clone bound from From<array/vec> for SmallVec * Relax From<array> for SmallVec to allow different length arrays.
1 parent 8445d21 commit 74075e3

File tree

2 files changed

+42
-4
lines changed

2 files changed

+42
-4
lines changed

src/lib.rs

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1909,12 +1909,28 @@ impl<'a, T: Clone, const N: usize> From<&'a [T]> for SmallVec<T, N> {
19091909
slice.iter().cloned().collect()
19101910
}
19111911
}
1912-
impl<T: Clone, const N: usize> From<[T; N]> for SmallVec<T, N> {
1913-
fn from(array: [T; N]) -> Self {
1914-
Self::from_buf(array)
1912+
1913+
impl<T, const N: usize, const M: usize> From<[T; M]> for SmallVec<T, N> {
1914+
fn from(array: [T; M]) -> Self {
1915+
if M > N {
1916+
// If M > N, we'd have to heap allocate anyway,
1917+
// so delegate for Vec for the allocation
1918+
Self::from(Vec::from(array))
1919+
} else {
1920+
// M <= N
1921+
let mut this = Self::new();
1922+
debug_assert!(M <= this.capacity());
1923+
let array = ManuallyDrop::new(array);
1924+
// SAFETY: M <= this.capacity()
1925+
unsafe {
1926+
copy_nonoverlapping(array.as_ptr(), this.as_mut_ptr(), M);
1927+
this.set_len(M);
1928+
}
1929+
this
1930+
}
19151931
}
19161932
}
1917-
impl<T: Clone, const N: usize> From<Vec<T>> for SmallVec<T, N> {
1933+
impl<T, const N: usize> From<Vec<T>> for SmallVec<T, N> {
19181934
fn from(array: Vec<T>) -> Self {
19191935
Self::from_vec(array)
19201936
}

src/tests.rs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,28 @@ fn test_from() {
644644
let small_vec: SmallVec<u8, 128> = SmallVec::from(array);
645645
assert_eq!(&*small_vec, vec![99u8; 128].as_slice());
646646
drop(small_vec);
647+
648+
#[derive(PartialEq, Eq, Debug)]
649+
struct NoClone(u8);
650+
let array = [NoClone(42)];
651+
let small_vec: SmallVec<NoClone, 1> = SmallVec::from(array);
652+
assert_eq!(&*small_vec, &[NoClone(42)]);
653+
drop(small_vec);
654+
655+
let vec = vec![NoClone(42)];
656+
let small_vec: SmallVec<NoClone, 1> = SmallVec::from(vec);
657+
assert_eq!(&*small_vec, &[NoClone(42)]);
658+
drop(small_vec);
659+
660+
let array = [1; 128];
661+
let small_vec: SmallVec<u8, 1> = SmallVec::from(array);
662+
assert_eq!(&*small_vec, vec![1; 128].as_slice());
663+
drop(small_vec);
664+
665+
let array = [99];
666+
let small_vec: SmallVec<u8, 128> = SmallVec::from(array);
667+
assert_eq!(&*small_vec, &[99u8]);
668+
drop(small_vec);
647669
}
648670

649671
#[test]

0 commit comments

Comments
 (0)