3 files changed, 11 insertions, 15 deletions

diff --git a/src/components/preference_pages/editor.rs b/src/components/preference_pages/editor.rs
index 28a8302..8fe40f0 100644
--- a/src/components/preference_pages/editor.rs
+++ b/src/components/preference_pages/editor.rs
@@ -182,7 +182,7 @@ impl SimpleComponent for Editor {
             EditorAction::SetFontSize(font_size) => self.font_size = font_size,
             EditorAction::SetSoftWrap(soft_wrap) => self.soft_wrap = soft_wrap,
             EditorAction::SetUseCustomFont(use_custom_font) => {
-                self.use_custom_font = use_custom_font
+                self.use_custom_font = use_custom_font;
             }
             EditorAction::SetCustomFont(custom_font) => self.custom_font = custom_font,
 
diff --git a/src/components/preference_pages/map.rs b/src/components/preference_pages/map.rs
index abeabf9..5ec59e1 100644
--- a/src/components/preference_pages/map.rs
+++ b/src/components/preference_pages/map.rs
@@ -190,11 +190,11 @@ impl SimpleComponent for Map {
             MapAction::SetUseCustomFont(use_custom_font) => self.use_custom_font = use_custom_font,
             MapAction::SetShowBackground(show_background) => self.show_background = show_background,
             MapAction::SetUseSmartLabelPositioning(use_smart_label_positioning) => {
-                self.use_smart_label_positioning = use_smart_label_positioning
+                self.use_smart_label_positioning = use_smart_label_positioning;
             }
             MapAction::SetCustomFont(custom_font) => self.custom_font = custom_font,
             MapAction::SetDefaultExportFormat(default_export_format) => {
-                self.default_export_format = default_export_format
+                self.default_export_format = default_export_format;
             }
 
             MapAction::ChangeFontDescription(button) => {
diff --git a/src/components/preference_pages/templates.rs b/src/components/preference_pages/templates.rs
index 5652816..0ad4799 100644
--- a/src/components/preference_pages/templates.rs
+++ b/src/components/preference_pages/templates.rs
@@ -143,7 +143,7 @@ impl SimpleComponent for Templates {
                         set_show_end_title_buttons: false,
                         set_show_start_title_buttons: false,
                         #[wrap(Some)]
-                        set_title_widget = if model.template_rows.len() > 0 || !model.selected_template.is_some() {
+                        set_title_widget = if !model.template_rows.is_empty() || model.selected_template.is_none() {
                             &gtk::Label {
                                 #[watch]
                                 set_label: &model.selected_name,
@@ -167,7 +167,7 @@ impl SimpleComponent for Templates {
                         set_spacing: 5,
                         set_hexpand: true,
 
-                        if model.template_rows.len() > 0 && model.selected_template.is_some() {
+                        if !model.template_rows.is_empty() && model.selected_template.is_some() {
                             gtk::ScrolledWindow {
                                 set_vexpand: true,
                                 set_hexpand: true,
@@ -217,7 +217,7 @@ impl SimpleComponent for Templates {
             });
 
         let first = init.templates.first();
-        let selected_template = first.map_or(None, |t| Some(t.clone()));
+        let selected_template = first.cloned();
         let source = Self::create_source_buffer(first, &sender);
 
         {
@@ -228,7 +228,7 @@ impl SimpleComponent for Templates {
         }
 
         let source_view = Self::init_source_view(&source);
-        let selected_name = selected_template.clone().map_or("".to_string(), |t| t.name);
+        let selected_name = selected_template.clone().map_or(String::new(), |t| t.name);
 
         let model = Self {
             selected_template,
@@ -267,11 +267,7 @@ impl SimpleComponent for Templates {
                 let index = guard.iter().position(|s| s.template.id == id);
                 if let Some(index) = index {
                     guard.remove(index);
-                    if self
-                        .selected_template
-                        .as_ref()
-                        .map_or(false, |t| id == t.id)
-                    {
+                    if self.selected_template.as_ref().is_some_and(|t| id == t.id) {
                         guard.drop();
                         self.select_template(0, &sender);
                     }
@@ -342,13 +338,13 @@ impl SimpleComponent for Templates {
             TemplatesAction::Collapse => {
                 self.is_collapsed = true;
                 self.template_rows
-                    .broadcast(template_row::TemplateRowAction::ShowArrow)
+                    .broadcast(template_row::TemplateRowAction::ShowArrow);
             }
             TemplatesAction::Expand => {
                 self.is_collapsed = false;
                 self.is_showing_content = false;
                 self.template_rows
-                    .broadcast(template_row::TemplateRowAction::HideArrow)
+                    .broadcast(template_row::TemplateRowAction::HideArrow);
             }
         }
     }
@@ -431,7 +427,7 @@ impl Templates {
         if let Some(row) = guard.get(index) {
             self.selected_template = Some(row.template.clone());
             self.selected_name = row.template.clone().name;
-            self.source = Self::create_source_buffer(Some(&row.template), &sender);
+            self.source = Self::create_source_buffer(Some(&row.template), sender);
             self.source_view.set_buffer(Some(&self.source));
         }
         guard.drop();