-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds a fallible equivalent to `FromIterator` which returns `TryFromIteratorError` if the number of items in the iterator does not match the size of the array.
- Loading branch information
Showing
3 changed files
with
110 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
//! Support for constructing arrays using a provided iterator function and other iterator-related | ||
//! functionality. | ||
|
||
use crate::{Array, ArraySize}; | ||
use core::slice::{Iter, IterMut}; | ||
|
||
/// Couldn't construct an array from an iterator because the number of items in the iterator | ||
/// didn't match the array size. | ||
#[derive(Clone, Copy, Debug)] | ||
pub struct TryFromIteratorError; | ||
|
||
impl<T, U> Array<T, U> | ||
where | ||
U: ArraySize, | ||
{ | ||
/// Construct an array from the given iterator, returning [`TryFromIteratorError`] in the event | ||
/// that the number of items in the iterator does not match the array size. | ||
pub fn try_from_iter<I: IntoIterator<Item = T>>(iter: I) -> Result<Self, TryFromIteratorError> { | ||
let mut iter = iter.into_iter(); | ||
let ret = Self::try_from_fn(|_| iter.next().ok_or(TryFromIteratorError))?; | ||
|
||
match iter.next() { | ||
None => Ok(ret), | ||
Some(_) => Err(TryFromIteratorError), | ||
} | ||
} | ||
} | ||
|
||
impl<T, U> FromIterator<T> for Array<T, U> | ||
where | ||
U: ArraySize, | ||
{ | ||
fn from_iter<I: IntoIterator<Item = T>>(iter: I) -> Self { | ||
let mut iter = iter.into_iter(); | ||
let ret = Self::from_fn(|_| { | ||
iter.next() | ||
.expect("iterator should have enough items to fill array") | ||
}); | ||
|
||
assert!( | ||
iter.next().is_none(), | ||
"too many items in iterator to fit in array" | ||
); | ||
|
||
ret | ||
} | ||
} | ||
|
||
impl<T, U> IntoIterator for Array<T, U> | ||
where | ||
U: ArraySize, | ||
{ | ||
type Item = T; | ||
type IntoIter = <U::ArrayType<T> as IntoIterator>::IntoIter; | ||
|
||
/// Creates a consuming iterator, that is, one that moves each value out of the array (from | ||
/// start to end). | ||
/// | ||
/// The array cannot be used after calling this unless `T` implements `Copy`, so the whole | ||
/// array is copied. | ||
#[inline] | ||
fn into_iter(self) -> Self::IntoIter { | ||
self.0.into_iter() | ||
} | ||
} | ||
|
||
impl<'a, T, U> IntoIterator for &'a Array<T, U> | ||
where | ||
U: ArraySize, | ||
{ | ||
type Item = &'a T; | ||
type IntoIter = Iter<'a, T>; | ||
|
||
#[inline] | ||
fn into_iter(self) -> Iter<'a, T> { | ||
self.iter() | ||
} | ||
} | ||
|
||
impl<'a, T, U> IntoIterator for &'a mut Array<T, U> | ||
where | ||
U: ArraySize, | ||
{ | ||
type Item = &'a mut T; | ||
type IntoIter = IterMut<'a, T>; | ||
|
||
#[inline] | ||
fn into_iter(self) -> IterMut<'a, T> { | ||
self.iter_mut() | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters