diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2018-12-30 17:40:11 +0100 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2019-02-15 20:53:29 +0100 |
commit | b383e082fb6ca3f7b247529e923b62c069c67612 (patch) | |
tree | 033c45ae6744956b179b537574010275d5568293 /lib | |
parent | 14a2485a8aae4f2fd765ff0b343035f926e57f70 (diff) |
Fix libimagtodo for new StoreId interface with Entries iterator
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/domain/libimagtodo/src/iter.rs | 10 | ||||
-rw-r--r-- | lib/domain/libimagtodo/src/taskstore.rs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/domain/libimagtodo/src/iter.rs b/lib/domain/libimagtodo/src/iter.rs index 5809802e..45d7a7c8 100644 --- a/lib/domain/libimagtodo/src/iter.rs +++ b/lib/domain/libimagtodo/src/iter.rs @@ -17,22 +17,22 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA // -use libimagstore::storeid::StoreIdIterator; +use libimagstore::iter::Entries; use libimagstore::storeid::StoreId; use failure::Fallible as Result; -pub struct TaskIdIterator(StoreIdIterator); +pub struct TaskIdIterator<'a>(Entries<'a>); -impl TaskIdIterator { +impl<'a> TaskIdIterator<'a> { - pub fn new(inner: StoreIdIterator) -> Self { + pub fn new(inner: Entries<'a>) -> Self { TaskIdIterator(inner) } } -impl Iterator for TaskIdIterator { +impl<'a> Iterator for TaskIdIterator<'a> { type Item = Result<StoreId>; fn next(&mut self) -> Option<Self::Item> { diff --git a/lib/domain/libimagtodo/src/taskstore.rs b/lib/domain/libimagtodo/src/taskstore.rs index a166c5c5..48b6e16e 100644 --- a/lib/domain/libimagtodo/src/taskstore.rs +++ b/lib/domain/libimagtodo/src/taskstore.rs @@ -162,7 +162,7 @@ impl<'a> TaskStore<'a> for Store { } fn all_tasks(&self) -> Result<TaskIdIterator> { - self.entries().map(|i| TaskIdIterator::new(i.without_store())) + self.entries().map(|i| TaskIdIterator::new(i)) } fn new_from_twtask(&'a self, task: TTask) -> Result<FileLockEntry<'a>> { |