wojtek/musichoard
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases 2 Wiki Activity

Sort albums by month if two releases of the same artist happen in the same year #155

Merged
wojtek merged 12 commits from 106---sort-albums-by-month-if-two-releases-of-the-same-artist-happen-in-the-same-year into main 2024-03-05 23:24:18 +01:00
Conversation 0 Commits 12 Files Changed 30 +6 -4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0fee810040 - Show all commits

10
src/core/collection/merge.rs
View File

@ -86,17 +86,19 @@ pub trait WithId {
fn id(&self) -> &Self::Id;
}
pub struct MergeCollections<ID, T> {
pub struct MergeCollections<ID, T, IT> {
_id: PhantomData<ID>,
_t: PhantomData<T>,
_it: PhantomData<IT>,
}
impl<ID, T> MergeCollections<ID, T>
impl<ID, T, IT> MergeCollections<ID, T, IT>
where
ID: Eq + Hash + Clone,
T: WithId<Id = ID> + Merge + Ord,
IT: IntoIterator<Item = T>,
{
pub fn merge_iter<IT: IntoIterator<Item = T>>(primary: IT, secondary: IT) -> Vec<T> {
pub fn merge_iter(primary: IT, secondary: IT) -> Vec<T> {
let primary = primary
.into_iter()
.map(|item| (item.id().clone(), item))
@ -104,7 +106,7 @@ where
Self::merge(primary, secondary)
}
pub fn merge<IT: IntoIterator<Item = T>>(mut primary: HashMap<ID, T>, secondary: IT) -> Vec<T> {
pub fn merge(mut primary: HashMap<ID, T>, secondary: IT) -> Vec<T> {
for secondary_item in secondary {
if let Some(ref mut primary_item) = primary.get_mut(secondary_item.id()) {
primary_item.merge_in_place(secondary_item);