mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git
synced 2024-11-29 04:51:09 +00:00
iterator: Add a few more constructors for convenience
And implement `Vec` version more generically. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1568>
This commit is contained in:
parent
43fbdd54a7
commit
1deddbc6d3
1 changed files with 65 additions and 12 deletions
|
@ -200,7 +200,22 @@ where
|
||||||
{
|
{
|
||||||
pub fn from_vec(items: Vec<T>) -> Self {
|
pub fn from_vec(items: Vec<T>) -> Self {
|
||||||
skip_assert_initialized!();
|
skip_assert_initialized!();
|
||||||
Self::new(VecIteratorImpl::new(items))
|
Self::new(ArrayIteratorImpl::new(items))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn from_array<A: AsRef<[T]> + Send + Clone + 'static>(items: A) -> Self {
|
||||||
|
skip_assert_initialized!();
|
||||||
|
Self::new(ArrayIteratorImpl::new(items))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn from_option(items: Option<T>) -> Self {
|
||||||
|
skip_assert_initialized!();
|
||||||
|
Self::new(OptionIteratorImpl::new(items))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn from_single(item: T) -> Self {
|
||||||
|
skip_assert_initialized!();
|
||||||
|
Self::new(OptionIteratorImpl::new(Some(item)))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -282,28 +297,32 @@ where
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
struct VecIteratorImpl<T> {
|
struct ArrayIteratorImpl<A, T> {
|
||||||
pos: usize,
|
pos: usize,
|
||||||
items: Vec<T>,
|
items: A,
|
||||||
|
phantom: PhantomData<T>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<T> VecIteratorImpl<T>
|
impl<T, A> ArrayIteratorImpl<A, T> {
|
||||||
where
|
fn new(items: A) -> Self {
|
||||||
for<'a> T: StaticType + ToValue + FromValue<'a> + Clone + Send + 'static,
|
|
||||||
{
|
|
||||||
fn new(items: Vec<T>) -> Self {
|
|
||||||
skip_assert_initialized!();
|
skip_assert_initialized!();
|
||||||
Self { pos: 0, items }
|
Self {
|
||||||
|
pos: 0,
|
||||||
|
items,
|
||||||
|
phantom: PhantomData,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<T> IteratorImpl<T> for VecIteratorImpl<T>
|
impl<T, A> IteratorImpl<T> for ArrayIteratorImpl<A, T>
|
||||||
where
|
where
|
||||||
|
A: AsRef<[T]> + Send + Clone + 'static,
|
||||||
for<'a> T: StaticType + ToValue + FromValue<'a> + Clone + Send + 'static,
|
for<'a> T: StaticType + ToValue + FromValue<'a> + Clone + Send + 'static,
|
||||||
{
|
{
|
||||||
fn next(&mut self) -> Option<Result<T, IteratorError>> {
|
fn next(&mut self) -> Option<Result<T, IteratorError>> {
|
||||||
if self.pos < self.items.len() {
|
let items = self.items.as_ref();
|
||||||
let res = Ok(self.items[self.pos].clone());
|
if self.pos < items.len() {
|
||||||
|
let res = Ok(items[self.pos].clone());
|
||||||
self.pos += 1;
|
self.pos += 1;
|
||||||
return Some(res);
|
return Some(res);
|
||||||
}
|
}
|
||||||
|
@ -316,6 +335,40 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
struct OptionIteratorImpl<T> {
|
||||||
|
finished: bool,
|
||||||
|
items: Option<T>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T> OptionIteratorImpl<T> {
|
||||||
|
fn new(items: Option<T>) -> Self {
|
||||||
|
skip_assert_initialized!();
|
||||||
|
Self {
|
||||||
|
finished: false,
|
||||||
|
items,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T> IteratorImpl<T> for OptionIteratorImpl<T>
|
||||||
|
where
|
||||||
|
for<'a> T: StaticType + ToValue + FromValue<'a> + Clone + Send + 'static,
|
||||||
|
{
|
||||||
|
fn next(&mut self) -> Option<Result<T, IteratorError>> {
|
||||||
|
if self.finished {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
let res = Ok(self.items.clone()).transpose();
|
||||||
|
self.finished = true;
|
||||||
|
res
|
||||||
|
}
|
||||||
|
|
||||||
|
fn resync(&mut self) {
|
||||||
|
self.finished = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
unsafe impl<T> Send for Iterator<T> {}
|
unsafe impl<T> Send for Iterator<T> {}
|
||||||
unsafe impl<T> Sync for Iterator<T> {}
|
unsafe impl<T> Sync for Iterator<T> {}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue