refactor keymap map visitor to reduce # of cases

Matthew Cheely 2 years ago
parent 82b55483ad
commit e9320ebdc7

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

Loading…
Cancel
Save