pcvolkmer/osc-variant
1
0
Fork 0
mirror of https://github.com/pcvolkmer/osc-variant.git synced 2025-04-19 19:56:50 +00:00
Code Issues

refactor: replace closure with method

Browse Source
This commit is contained in:
Paul-Christian Volkmer 2024-12-08 12:28:49 +01:00
parent efa2dc68d6
commit 37d945d016
4 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/model/data_catalogue.rs
View File

@ -80,9 +80,7 @@ impl Sortable for DataCatalogue {
} }
fn sorted(&mut self) -> &Self { fn sorted(&mut self) -> &Self {
self.entries self.entries.entry.sort_unstable_by_key(Entry::sorting_key);
.entry
.sort_unstable_by_key(|item| item.sorting_key());
self.entries.entry.iter_mut().for_each(|item| { self.entries.entry.iter_mut().for_each(|item| {
item.sorted(); item.sorted();
}); });
@ -118,7 +116,7 @@ impl Requires for DataCatalogue {
None => Requirement::ExternalPropertyCatalogue(entry), None => Requirement::ExternalPropertyCatalogue(entry),
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
result.sort_unstable_by_key(|item| item.sorting_key()); result.sort_unstable_by_key(Requirement::sorting_key);
result result
} }
@ -230,7 +228,7 @@ impl Sortable for Entry {
{ {
if let Some(ref mut use_) = self.use_ { if let Some(ref mut use_) = self.use_ {
use_.program_module use_.program_module
.sort_unstable_by_key(|item| item.sorting_key()); .sort_unstable_by_key(ProgramModule::sorting_key);
} }
self self
} }

10
src/model/form.rs
View File

@ -260,9 +260,7 @@ impl<Type: 'static> Sortable for Form<Type> {
fn sorted(&mut self) -> &Self { fn sorted(&mut self) -> &Self {
self.data_catalogues.data_catalogue.sort_unstable(); self.data_catalogues.data_catalogue.sort_unstable();
self.entries self.entries.entry.sort_unstable_by_key(Entry::sorting_key);
.entry
.sort_unstable_by_key(|item| item.sorting_key());
self.entries.entry.iter_mut().for_each(|item| { self.entries.entry.iter_mut().for_each(|item| {
item.sorted(); item.sorted();
@ -357,7 +355,7 @@ where
None => Requirement::ExternalDataCatalogue(entry.to_string()), None => Requirement::ExternalDataCatalogue(entry.to_string()),
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
result.sort_unstable_by_key(|item| item.sorting_key()); result.sort_unstable_by_key(Requirement::sorting_key);
let referenced_forms = &mut self let referenced_forms = &mut self
.entries .entries
@ -378,7 +376,7 @@ where
}, },
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
referenced_forms.sort_unstable_by_key(|item| item.sorting_key()); referenced_forms.sort_unstable_by_key(Requirement::sorting_key);
result.append(referenced_forms); result.append(referenced_forms);
let sub_forms = &mut self let sub_forms = &mut self
@ -400,7 +398,7 @@ where
}, },
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
sub_forms.sort_unstable_by_key(|item| item.sorting_key()); sub_forms.sort_unstable_by_key(Requirement::sorting_key);
result.append(sub_forms); result.append(sub_forms);
result result

18
src/model/onkostar_editor.rs
View File

@ -212,7 +212,7 @@ impl OnkostarEditor {
pub fn sorted(&mut self) { pub fn sorted(&mut self) {
self.editor self.editor
.property_catalogue .property_catalogue
.sort_unstable_by_key(|e| e.sorting_key()); .sort_unstable_by_key(Sortable::sorting_key);
self.editor.property_catalogue.iter_mut().for_each(|item| { self.editor.property_catalogue.iter_mut().for_each(|item| {
item.sorted(); item.sorted();
@ -220,7 +220,7 @@ impl OnkostarEditor {
self.editor self.editor
.data_catalogue .data_catalogue
.sort_unstable_by_key(|e| e.sorting_key()); .sort_unstable_by_key(Sortable::sorting_key);
self.editor.data_catalogue.iter_mut().for_each(|item| { self.editor.data_catalogue.iter_mut().for_each(|item| {
item.sorted(); item.sorted();
@ -325,14 +325,8 @@ impl OnkostarEditor {
let mut has_diff = false; let mut has_diff = false;
let names_a = list_a let names_a = list_a.iter().map(Comparable::get_name).collect::<Vec<_>>();
.iter() let names_b = list_b.iter().map(Comparable::get_name).collect::<Vec<_>>();
.map(|entry| entry.get_name())
.collect::<Vec<_>>();
let names_b = list_b
.iter()
.map(|entry| entry.get_name())
.collect::<Vec<_>>();
names_b.iter().for_each(|entry| { names_b.iter().for_each(|entry| {
if !names_a.contains(entry) { if !names_a.contains(entry) {
@ -424,14 +418,14 @@ impl Checkable for OnkostarEditor {
.editor .editor
.data_form .data_form
.iter() .iter()
.flat_map(|entity| entity.check()) .flat_map(Form::check)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let other = &mut self let other = &mut self
.editor .editor
.unterformular .unterformular
.iter() .iter()
.flat_map(|entity| entity.check()) .flat_map(Form::check)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
result.append(other); result.append(other);

11
src/model/property_catalogue.rs
View File

@ -147,7 +147,7 @@ impl Sortable for Version {
Self: Sized, Self: Sized,
{ {
if let Some(ref mut abbildung) = self.abbildung { if let Some(ref mut abbildung) = self.abbildung {
abbildung.sort_unstable_by_key(|item| item.sorting_key()); abbildung.sort_unstable_by_key(Abbildung::sorting_key);
abbildung.iter_mut().for_each(|item| { abbildung.iter_mut().for_each(|item| {
item.sorted(); item.sorted();
}); });
@ -156,7 +156,7 @@ impl Sortable for Version {
if let Some(ref mut entries) = self.entries { if let Some(ref mut entries) = self.entries {
entries entries
.content .content
.sort_unstable_by_key(|item| item.sorting_key()); .sort_unstable_by_key(VersionEntry::sorting_key);
entries.content.iter_mut().for_each(|item| { entries.content.iter_mut().for_each(|item| {
item.sorted(); item.sorted();
}); });
@ -165,7 +165,7 @@ impl Sortable for Version {
if let Some(ref mut categories) = self.categories { if let Some(ref mut categories) = self.categories {
categories categories
.content .content
.sort_unstable_by_key(|item| item.sorting_key()); .sort_unstable_by_key(Category::sorting_key);
categories.content.iter_mut().for_each(|item| { categories.content.iter_mut().for_each(|item| {
item.sorted(); item.sorted();
}); });
@ -246,7 +246,7 @@ impl Sortable for Category {
{ {
self.category_entries self.category_entries
.content .content
.sort_unstable_by_key(|item| item.sorting_key()); .sort_unstable_by_key(CategoryEntry::sorting_key);
self.category_entries.content.iter_mut().for_each(|item| { self.category_entries.content.iter_mut().for_each(|item| {
item.sorted(); item.sorted();
}); });
@ -305,7 +305,8 @@ impl Sortable for Abbildung {
where where
Self: Sized, Self: Sized,
{ {
self.content.sort_unstable_by_key(|item| item.sorting_key()); self.content
.sort_unstable_by_key(AbbildungEintrag::sorting_key);
self.content.iter_mut().for_each(|item| { self.content.iter_mut().for_each(|item| {
item.sorted(); item.sorted();
}); });