Simplify labelled command pattern match

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

helix-term/src/keymap.rs

@@ -217,19 +217,14 @@ impl<'de> serde::de::Visitor<'de> for KeyTrieVisitor {
 
         match command {
             None => Ok(KeyTrie::Node(KeyTrieNode::new(label, mapping, order))),
-            Some(cmd) => {
+            Some(MappableCommand::Typable { name, args, .. }) if !label.is_empty() => {
-                let status = (cmd, label.is_empty());
+                Ok(KeyTrie::Leaf(MappableCommand::Typable {
-                if let (MappableCommand::Typable { name, args, .. }, false) = status {
+                    name,
-                    Ok(MappableCommand::Typable {
+                    args,
-                        name,
+                    doc: label.to_string(),
-                        args,
+                }))
-                        doc: label.to_string(),
-                    })
-                    .map(KeyTrie::Leaf)
-                } else {
-                    Ok(KeyTrie::Leaf(status.0))
-                }
             }
+            Some(command) => Ok(KeyTrie::Leaf(command)),
         }
     }
 }