allow items that implement Clone

This commit is contained in:
Paul Kernfeld
2020-05-12 14:57:38 -04:00
parent 488efd0b3e
commit 675e992741
2 changed files with 18 additions and 4 deletions
+8 -3
View File
@@ -715,19 +715,24 @@ impl<A: Array> From<A> for ArrayVec<A> {
/// use arrayvec::ArrayVec;
/// use std::convert::TryInto as _;
///
/// let mut array: ArrayVec<[_; 4]> = (&[1, 2, 3] as &[_]).try_into().unwrap();
/// let array: ArrayVec<[_; 4]> = (&[1, 2, 3] as &[_]).try_into().unwrap();
/// assert_eq!(array.len(), 3);
/// assert_eq!(array.capacity(), 4);
/// ```
impl<A: Array> std::convert::TryFrom<&[A::Item]> for ArrayVec<A>
where
A::Item: Copy,
A::Item: Clone,
{
type Error = CapacityError;
fn try_from(slice: &[A::Item]) -> Result<Self, Self::Error> {
if A::CAPACITY < slice.len() {
Err(CapacityError::new(()))
} else {
let mut array = Self::new();
array.try_extend_from_slice(slice).map(|()| array)
array.extend(slice.iter().cloned());
Ok(array)
}
}
}
+9
View File
@@ -65,6 +65,15 @@ fn test_extend_from_slice_error() {
assert_matches!(res, Err(_));
}
#[test]
fn test_try_from_slice_error() {
use arrayvec::ArrayVec;
use std::convert::TryInto as _;
let res: Result<ArrayVec<[_; 2]>, _> = (&[1, 2, 3] as &[_]).try_into();
assert_matches!(res, Err(_));
}
#[test]
fn test_u16_index() {
const N: usize = 4096;