Rewrite From<> implementations for habit iterators

to be generic over all iterators over StoreIds, so they can be build
directly from them.

1 files changed, 13 insertions, 0 deletions

diff --git a/lib/domain/libimaghabit/src/iter.rs b/lib/domain/libimaghabit/src/iter.rs
index 9d5d740f..71f7220b 100644
--- a/lib/domain/libimaghabit/src/iter.rs
+++ b/lib/domain/libimaghabit/src/iter.rs
@@ -18,6 +18,7 @@
 //
 
 use libimagstore::storeid::StoreIdIterator;
+use libimagstore::storeid::StoreIdIteratorWithStore;
 use libimagstore::storeid::StoreId;
 
 use util::IsHabitCheck;
@@ -43,6 +44,12 @@ impl From<StoreIdIterator> for HabitTemplateStoreIdIterator {
     }
 }
 
+impl<'a> From<StoreIdIteratorWithStore<'a>> for HabitTemplateStoreIdIterator {
+    fn from(sii: StoreIdIteratorWithStore<'a>) -> Self {
+        HabitTemplateStoreIdIterator(sii.without_store())
+    }
+}
+
 pub struct HabitInstanceStoreIdIterator(StoreIdIterator);
 
 impl HabitInstanceStoreIdIterator {
@@ -70,3 +77,9 @@ impl From<StoreIdIterator> for HabitInstanceStoreIdIterator {
     }
 }
 
+impl<'a> From<StoreIdIteratorWithStore<'a>> for HabitInstanceStoreIdIterator {
+    fn from(sii: StoreIdIteratorWithStore<'a>) -> Self {
+        HabitInstanceStoreIdIterator(sii.without_store())
+    }
+}
+