Matthias Beyer
d08c27e623
This patch reimplements the iterator extensions. As we iterate (in StoreIdIterator) over Result<StoreId> now anyways, we don't need the extensions for Result iterators anymore. This patch rewrites the extensions to be more simple in every way and generic over the error type in the iterator. All the errors have to do is implement From<StoreError>, which is what they do when linking the generated error types with error_chain to the libimagstore error types.
146 lines
4.3 KiB
Rust
146 lines
4.3 KiB
Rust
//
|
|
// imag - the personal information management suite for the commandline
|
|
// Copyright (C) 2015-2018 Matthias Beyer <mail@beyermatthias.de> and contributors
|
|
//
|
|
// This library is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU Lesser General Public
|
|
// License as published by the Free Software Foundation; version
|
|
// 2.1 of the License.
|
|
//
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
// Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
// License along with this library; if not, write to the Free Software
|
|
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
//
|
|
|
|
macro_rules! mk_iterator_mod {
|
|
{
|
|
modname = $modname:ident,
|
|
itername = $itername:ident,
|
|
iteryield = $yield:ty,
|
|
extname = $extname:ident,
|
|
extfnname = $extfnname:ident,
|
|
fun = $fun:expr
|
|
} => {
|
|
pub mod $modname {
|
|
use storeid::StoreId;
|
|
#[allow(unused_imports)]
|
|
use store::FileLockEntry;
|
|
use store::Store;
|
|
use error::StoreError;
|
|
use std::result::Result as RResult;
|
|
|
|
pub struct $itername<'a, E>(Box<Iterator<Item = RResult<StoreId, E>> + 'a>, &'a Store)
|
|
where E: From<StoreError>;
|
|
|
|
impl<'a, E> $itername<'a, E>
|
|
where E: From<StoreError>
|
|
{
|
|
pub fn new(inner: Box<Iterator<Item = RResult<StoreId, E>> + 'a>, store: &'a Store) -> Self {
|
|
$itername(inner, store)
|
|
}
|
|
}
|
|
|
|
impl<'a, E> Iterator for $itername<'a, E>
|
|
where E: From<StoreError>
|
|
{
|
|
type Item = RResult<$yield, E>;
|
|
|
|
fn next(&mut self) -> Option<Self::Item> {
|
|
self.0.next().map(|id| $fun(id?, self.1).map_err(E::from))
|
|
}
|
|
}
|
|
|
|
pub trait $extname<'a, E>
|
|
where E: From<StoreError>
|
|
{
|
|
fn $extfnname(self, store: &'a Store) -> $itername<'a, E>;
|
|
}
|
|
|
|
impl<'a, I, E> $extname<'a, E> for I
|
|
where I: Iterator<Item = RResult<StoreId, E>> + 'a,
|
|
E: From<StoreError>
|
|
{
|
|
fn $extfnname(self, store: &'a Store) -> $itername<'a, E> {
|
|
$itername(Box::new(self), store)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
mk_iterator_mod! {
|
|
modname = create,
|
|
itername = StoreCreateIterator,
|
|
iteryield = FileLockEntry<'a>,
|
|
extname = StoreIdCreateIteratorExtension,
|
|
extfnname = into_create_iter,
|
|
fun = |id: StoreId, store: &'a Store| store.create(id)
|
|
}
|
|
|
|
mk_iterator_mod! {
|
|
modname = delete,
|
|
itername = StoreDeleteIterator,
|
|
iteryield = (),
|
|
extname = StoreIdDeleteIteratorExtension,
|
|
extfnname = into_delete_iter,
|
|
fun = |id: StoreId, store: &'a Store| store.delete(id)
|
|
}
|
|
|
|
mk_iterator_mod! {
|
|
modname = get,
|
|
itername = StoreGetIterator,
|
|
iteryield = Option<FileLockEntry<'a>>,
|
|
extname = StoreIdGetIteratorExtension,
|
|
extfnname = into_get_iter,
|
|
fun = |id: StoreId, store: &'a Store| store.get(id)
|
|
}
|
|
|
|
mk_iterator_mod! {
|
|
modname = retrieve,
|
|
itername = StoreRetrieveIterator,
|
|
iteryield = FileLockEntry<'a>,
|
|
extname = StoreIdRetrieveIteratorExtension,
|
|
extfnname = into_retrieve_iter,
|
|
fun = |id: StoreId, store: &'a Store| store.retrieve(id)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[allow(dead_code)]
|
|
mod compile_test {
|
|
|
|
// This module contains code to check whether this actually compiles the way we would like it to
|
|
// compile
|
|
|
|
use store::Store;
|
|
use storeid::StoreId;
|
|
|
|
fn store() -> Store {
|
|
unimplemented!("Not implemented because in compile-test")
|
|
}
|
|
|
|
fn test_compile_get() {
|
|
let store = store();
|
|
let _ = store
|
|
.entries()
|
|
.unwrap()
|
|
.into_get_iter();
|
|
}
|
|
|
|
fn test_compile_get_result() {
|
|
fn to_result(e: StoreId) -> Result<StoreId, ()> {
|
|
Ok(e)
|
|
}
|
|
|
|
let store = store();
|
|
let _ = store
|
|
.entries()
|
|
.unwrap()
|
|
.into_get_iter();
|
|
}
|
|
}
|
|
|