Merge pull request #401 from matthiasbeyer/libimagutil/code-cleanup

Code cleanup in libimagutil

libimagutil/src/key_value_split.rs

@@ -56,18 +56,10 @@ impl IntoKeyValue<String, String> for String {
                     .unwrap();
             }
             R.captures(&self[..])
-                .map(|caps| {
+                .map(|caps| caps.name("VALUE").or(caps.name("QVALUE")).unwrap_or(""))
-                    caps.name("VALUE")
-                        .or(caps.name("QVALUE"))
-                        .unwrap_or("")
-                })
         };
 
-        key.and_then(|k| {
+        key.and_then(|k| value.and_then(|v| Some(KeyValue::new(String::from(k), String::from(v)))))
-            value.and_then(|v| {
-                Some(KeyValue::new(String::from(k), String::from(v)))
-            })
-        })
     }
 
 }