rusty-donkey/heave
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: simplify return type of catalog.list_by_subclass method

Browse Source
This commit is contained in:
davidemazzocchi
2026-02-27 10:48:43 +01:00
parent dcfa4dee4b
commit 181e310ebd
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
01.workspace/heave/src/imp/catalog_list_by_subclass.rs
View File

@@ -24,7 +24,7 @@ impl Catalog {
/// ///
/// Returns `Err(FailedTo::LockCatalog)` if the catalog's internal mutex /// Returns `Err(FailedTo::LockCatalog)` if the catalog's internal mutex
/// could not be locked. /// could not be locked.
pub fn list_by_subclass<T>(&self, subclass: &str) -> Result<Vec<Result<T, FailedTo>>, FailedTo> pub fn list_by_subclass<T>(&self, subclass: &str) -> Result<Vec<T>, FailedTo>
where where
T: EAV, T: EAV,
{ {
@@ -33,7 +33,7 @@ impl Catalog {
.values() .values()
.filter(move |item| item.class == T::class()) .filter(move |item| item.class == T::class())
.filter(move |item| item.subclass == Some(subclass.to_string())) .filter(move |item| item.subclass == Some(subclass.to_string()))
.map(|item| T::try_from(item.clone()).map_err(|_| FailedTo::ConvertEntity)) .filter_map(|item| { T::try_from(item.clone()).ok() })
.collect()) .collect())
}) })
} }

2
01.workspace/heave/src/tst/catalog_list_by_class_and_subclass.rs
View File

@@ -26,7 +26,6 @@ mod tests {
.list_by_subclass::<Item>("electronics") .list_by_subclass::<Item>("electronics")
.unwrap() .unwrap()
.into_iter() .into_iter()
.map(|item| item.unwrap())
.collect(); .collect();
assert_eq!(results.len(), 2); assert_eq!(results.len(), 2);
assert!(results.contains(&item1)); assert!(results.contains(&item1));
@@ -46,7 +45,6 @@ mod tests {
.list_by_subclass::<Item>("books") .list_by_subclass::<Item>("books")
.unwrap() .unwrap()
.into_iter() .into_iter()
.map(|item| item.unwrap())
.collect(); .collect();
assert!(results.is_empty()); assert!(results.is_empty());
} }