[core] Split up and clean up conversion.hpp

1 files changed, 5 insertions, 4 deletions

diff --git a/src/mbgl/style/parser.cpp b/src/mbgl/style/parser.cpp
index eddda5d3f2..bbe2fd7862 100644
--- a/src/mbgl/style/parser.cpp
+++ b/src/mbgl/style/parser.cpp
@@ -11,6 +11,7 @@
 #include <mbgl/style/layers/background_layer.hpp>
 #include <mbgl/style/rapidjson_conversion.hpp>
 #include <mbgl/style/conversion.hpp>
+#include <mbgl/style/conversion/filter.hpp>
 
 #include <mbgl/platform/log.hpp>
 
@@ -277,11 +278,11 @@ void Parser::parseLayer(const std::string& id, const JSValue& value, std::unique
         }
 
         if (value.HasMember("filter")) {
-            conversion::Result<Filter> filter = conversion::convertFilter(value["filter"]);
-            if (filter.is<Filter>()) {
-                impl->filter = filter.get<Filter>();
+            conversion::Result<Filter> filter = conversion::convert<Filter>(value["filter"]);
+            if (filter) {
+                impl->filter = *filter;
             } else {
-                Log::Warning(Event::ParseStyle, filter.get<conversion::Error>().message);
+                Log::Warning(Event::ParseStyle, filter.error().message);
             }
         }