From f64b87b4a8817e399493e11bf6f6ebe13a042ca3 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 5 Jan 2019 01:09:12 +0100 Subject: [PATCH] Adapt to new libimagstore::iter::Entries API Use Entries::into_storeid_iter() for transforming iterator into right type. Signed-off-by: Matthias Beyer --- lib/entry/libimagentrycategory/src/store.rs | 3 +-- 1 file changed, 1 insertion(+), 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 { 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 { 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) }