diff --git a/01.workspace/heave/src/imp/catalog_list_by_class_and_subclass.rs b/01.workspace/heave/src/imp/catalog_list_by_subclass.rs similarity index 84% rename from 01.workspace/heave/src/imp/catalog_list_by_class_and_subclass.rs rename to 01.workspace/heave/src/imp/catalog_list_by_subclass.rs index 23b5f02..6bdd856 100644 --- a/01.workspace/heave/src/imp/catalog_list_by_class_and_subclass.rs +++ b/01.workspace/heave/src/imp/catalog_list_by_subclass.rs @@ -1,7 +1,7 @@ use crate::*; impl Catalog { - /// Returns a list of all entities of a specific class and subclass from the in-memory catalog. + /// Returns a list of all entities of a specific subclass from the in-memory catalog. /// /// This method filters the in-memory entities by the class of type `T` and the /// provided `subclass`, then attempts to convert them into `T`. This is a purely @@ -24,10 +24,7 @@ impl Catalog { /// /// Returns `Err(FailedTo::LockCatalog)` if the catalog's internal mutex /// could not be locked. - pub fn list_by_class_and_subclass( - &self, - subclass: &str, - ) -> Result>, FailedTo> + pub fn list_by_subclass(&self, subclass: &str) -> Result>, FailedTo> where T: EAV, { diff --git a/01.workspace/heave/src/imp/mod.rs b/01.workspace/heave/src/imp/mod.rs index edfbed7..cd85b9d 100644 --- a/01.workspace/heave/src/imp/mod.rs +++ b/01.workspace/heave/src/imp/mod.rs @@ -10,7 +10,7 @@ pub mod catalog_insert_many; pub mod catalog_is_empty; pub mod catalog_len; pub mod catalog_list_by_class; -pub mod catalog_list_by_class_and_subclass; +pub mod catalog_list_by_subclass; pub mod catalog_load; pub mod catalog_load_by_filter; pub mod catalog_load_by_id; diff --git a/01.workspace/heave/src/tst/catalog_list_by_class_and_subclass.rs b/01.workspace/heave/src/tst/catalog_list_by_class_and_subclass.rs index 84c61ea..67efd6f 100644 --- a/01.workspace/heave/src/tst/catalog_list_by_class_and_subclass.rs +++ b/01.workspace/heave/src/tst/catalog_list_by_class_and_subclass.rs @@ -23,7 +23,7 @@ mod tests { let _ = catalog.upsert(item2.clone()); let _ = catalog.upsert(item3.clone()); let results: Vec<_> = catalog - .list_by_class_and_subclass::("electronics") + .list_by_subclass::("electronics") .unwrap() .into_iter() .map(|item| item.unwrap()) @@ -43,7 +43,7 @@ mod tests { }; let _ = catalog.upsert(item1.clone()); let results: Vec<_> = catalog - .list_by_class_and_subclass::("books") + .list_by_subclass::("books") .unwrap() .into_iter() .map(|item| item.unwrap())