Made suggested formatting tweaks

2 files changed, 7 insertions, 12 deletions

diff --git a/include/mbgl/style/filter.hpp b/include/mbgl/style/filter.hpp
index dc8e0b4938..9f503cf569 100644
--- a/include/mbgl/style/filter.hpp
+++ b/include/mbgl/style/filter.hpp
@@ -16,9 +16,9 @@ class Filter {
 public:
     std::shared_ptr<const expression::Expression> expression;
     
-    Filter():expression({}) {}
+    Filter() : expression({}) {}
     
-    Filter(expression::ParseResult parseResult):expression(std::move(*parseResult)) {}
+    Filter(expression::ParseResult parseResult) : expression(std::move(*parseResult)) {}
     
     bool operator()(const expression::EvaluationContext& context) const;
 
diff --git a/src/mbgl/style/conversion/filter.cpp b/src/mbgl/style/conversion/filter.cpp
index 501556175a..ed4a801f12 100644
--- a/src/mbgl/style/conversion/filter.cpp
+++ b/src/mbgl/style/conversion/filter.cpp
@@ -11,30 +11,25 @@ namespace style {
 namespace conversion {
     
 static bool isExpression(const Convertible& filter);
-    std::unique_ptr<expression::Expression> convertLegacyFilter(const Convertible& values, Error& error);
+std::unique_ptr<expression::Expression> convertLegacyFilter(const Convertible& values, Error& error);
 
 optional<Filter> Converter<Filter>::operator()(const Convertible& value, Error& error) const {
-    
-    optional<std::unique_ptr<expression::Expression>> expression;
-    
     if (isExpression(value)) {
         expression::ParsingContext parsingContext(expression::type::Boolean);
         expression::ParseResult parseResult = parsingContext.parseExpression(value);
         if (!parseResult) {
             error = { parsingContext.getCombinedErrors() };
             return {};
+        } else {
+            return { Filter(std::move(parseResult)) };
         }
-        expression = std::move(*parseResult);
     } else {
-        expression = convertLegacyFilter(value, error);
+        return Filter(convertLegacyFilter(value, error));
     }
-    
-    if (!expression) return {};
-    else return { Filter { std::move(*expression) } };
 }
 
 // This is a port from https://github.com/mapbox/mapbox-gl-js/blob/master/src/style-spec/feature_filter/index.js
-static bool isExpression(const Convertible& filter) {
+bool isExpression(const Convertible& filter) {
     if (!isArray(filter) || arrayLength(filter) == 0) {
         return false;
     }