Remove useless use of functional programming

Author: kangalio

src/commands.rs

@@ -322,15 +322,12 @@ impl Commands {
 }
 
 fn key_value_pair(s: &'static str) -> Option<&'static str> {
-    s.match_indices("={}")
-        .next()
-        .map(|pair| {
-            let name = &s[0..pair.0];
-            if !name.is_empty() {
-                Some(name)
-            } else {
-                None
-            }
-        })
-        .flatten()
+    let (match_index, _) = s.match_indices("={}").next()?;
+    let name = &s[0..match_index];
+
+    if !name.is_empty() {
+        Some(name)
+    } else {
+        None
+    }
 }

src/main.rs

@@ -202,15 +202,12 @@ fn app() -> Result<(), Error> {
 }
 
 fn main_menu(args: &Args, commands: &IndexMap<&str, (&str, GuardFn)>) -> String {
-    let mut menu = commands.iter().fold(
-        "Commands:\n".to_owned(),
-        |mut menu, (base_cmd, (description, guard))| {
-            if let Ok(true) = (guard)(&args) {
-                menu += &format!("\t{cmd:<12}{desc}\n", cmd = base_cmd, desc = description);
-            }
-            menu
-        },
-    );
+    let mut menu = "Commands:\n".to_owned();
+    for (base_cmd, (description, guard)) in commands {
+        if let Ok(true) = (guard)(&args) {
+            menu += &format!("\t{cmd:<12}{desc}\n", cmd = base_cmd, desc = description);
+        }
+    }
 
     menu += &format!("\t{help:<12}This menu\n", help = "?help");
     menu += "\nType ?help command for more info on a command.";