Use or_else() instead of or()

2018-04-24 20:58:02 +02:00 · 2018-04-24 20:58:02 +02:00 · 42c4186dec
commit 42c4186dec
parent 775508a6ed
1 changed files with 6 additions and 1 deletions
--- a/lib/etc/libimagutil/src/key_value_split.rs
+++ b/lib/etc/libimagutil/src/key_value_split.rs
@ -75,7 +75,12 @@ impl IntoKeyValue<String, String> for String {
                    .unwrap();
            }
            R.captures(&self[..])
-                .map(|c| c.name("VALUE").or(c.name("QVALUE")).map(|m| m.as_str()).unwrap_or(""))
+                .map(|c| {
+                    c.name("VALUE")
+                        .or_else(|| c.name("QVALUE"))
+                         .map(|m| m.as_str())
+                         .unwrap_or("")
+                })
        };

        key.and_then(|k| {