refactor: replace closure with method

src/model/data_catalogue.rs

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

src/model/form.rs

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

src/model/onkostar_editor.rs

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

src/model/property_catalogue.rs

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