factor out mods label code

Author: ids1024

src/page.rs

@@ -1,6 +1,6 @@
 use crate::fl;
 use crate::picker::{LAYERS, SCANCODE_LABELS};
-use backend::{Key, Keycode};
+use backend::{Key, Keycode, Mods};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub enum Page {
@@ -91,14 +91,7 @@ fn keycode_label(keycode: &Keycode) -> Option<Vec<String>> {
             if mods.is_empty() {
                 Some(vec![SCANCODE_LABELS.get(keycode)?.clone()])
             } else {
-                let mut label = String::new();
-                for name in mods.mod_names() {
-                    let mod_label = SCANCODE_LABELS.get(name)?;
-                    if !label.is_empty() {
-                        label.push_str(" + ");
-                    }
-                    label.push_str(mod_label);
-                }
+                let mut label = mods_label(*mods);
                 if keycode != "NONE" {
                     let keycode_label = SCANCODE_LABELS.get(keycode)?;
                     label.push_str(" + ");
@@ -108,14 +101,7 @@ fn keycode_label(keycode: &Keycode) -> Option<Vec<String>> {
             }
         }
         Keycode::MT(mods, keycode) => {
-            let mut mods_label = String::new();
-            for name in mods.mod_names() {
-                let mod_label = SCANCODE_LABELS.get(name)?;
-                if !mods_label.is_empty() {
-                    mods_label.push_str(" + ");
-                }
-                mods_label.push_str(mod_label);
-            }
+            let mods_label = mods_label(*mods);
             let keycode_label = SCANCODE_LABELS.get(keycode)?.clone();
             Some(vec![mods_label, keycode_label])
         }
@@ -127,3 +113,15 @@ fn keycode_label(keycode: &Keycode) -> Option<Vec<String>> {
         }
     }
 }
+
+fn mods_label(mods: Mods) -> String {
+    let mut label = String::new();
+    for name in mods.mod_names() {
+        let mod_label = SCANCODE_LABELS.get(name).map_or("", String::as_str);
+        if !label.is_empty() {
+            label.push_str(" + ");
+        }
+        label.push_str(mod_label);
+    }
+    label
+}