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>
This commit is contained in:
Matthias Beyer 2019-01-05 01:09:12 +01:00
parent c6cc1804e7
commit f64b87b4a8

View file

@ -109,7 +109,7 @@ impl CategoryStore for Store {
/// Get all category names /// Get all category names
fn all_category_names(&self) -> Result<CategoryNameIter> { fn all_category_names(&self) -> Result<CategoryNameIter> {
trace!("Getting all category names"); 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 /// Get a category by its name
@ -213,7 +213,6 @@ fn mk_category_storeid(base: PathBuf, s: &str) -> Result<StoreId> {
use libimagstore::storeid::IntoStoreId; use libimagstore::storeid::IntoStoreId;
::module_path::ModuleEntryPath::new(s) ::module_path::ModuleEntryPath::new(s)
.into_storeid() .into_storeid()
.map(|id| id.with_base(base))
.context(err_msg("Store id handling error")) .context(err_msg("Store id handling error"))
.map_err(Error::from) .map_err(Error::from)
} }