summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2019-01-05 01:09:12 +0100
committerMatthias Beyer <mail@beyermatthias.de>2019-02-15 20:53:29 +0100
commitf64b87b4a8817e399493e11bf6f6ebe13a042ca3 (patch)
tree6db7a815ceefed77584af55f9f5a83b35c0382e8 /lib
parentc6cc1804e752542cd97e6538edbce524cbd7d51c (diff)
Adapt to new libimagstore::iter::Entries API
Use Entries::into_storeid_iter() for transforming iterator into right type. Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/entry/libimagentrycategory/src/store.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/entry/libimagentrycategory/src/store.rs b/lib/entry/libimagentrycategory/src/store.rs
index d702aa0c..88746bb1 100644
--- a/lib/entry/libimagentrycategory/src/store.rs
+++ b/lib/entry/libimagentrycategory/src/store.rs
@@ -109,7 +109,7 @@ impl CategoryStore for Store {
/// Get all category names
fn all_category_names(&self) -> Result<CategoryNameIter> {
trace!("Getting all category names");
- Ok(CategoryNameIter::new(self, self.entries()?.without_store()))
+ Ok(CategoryNameIter::new(self, self.entries()?.into_storeid_iter()))
}
/// Get a category by its name
@@ -213,7 +213,6 @@ fn mk_category_storeid(base: PathBuf, s: &str) -> Result<StoreId> {
use libimagstore::storeid::IntoStoreId;
::module_path::ModuleEntryPath::new(s)
.into_storeid()
- .map(|id| id.with_base(base))
.context(err_msg("Store id handling error"))
.map_err(Error::from)
}