Update src/mapping/query/functions.rs

Co-authored-by: Bruce Guenter <[email protected]>
vectordotdev · Sep 9, 2020 · 1601b2c · 1601b2c
1 parent e7d3bb3
commit 1601b2c
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/mapping/query/functions.rs b/src/mapping/query/functions.rs
@@ -151,12 +151,10 @@ impl Function for ToBooleanFn {
                 _ => Err("unable to convert array or object into bool".to_string()),
             },
             Err(err) => Err(err),
-        };
-        if result.is_err() {
-            if let Some(v) = &self.default {
-                return Ok(v.clone());
-            }
-        }
+        }.or_else(|err| match &self.default {
+            Some(v) => Ok(v.clone()),
+            None => Err(err),
+        })
         result
     }
 }