Fix formatting expected by sanity check

src/mbgl/layout/pattern_layout.hpp

@@ -21,34 +21,26 @@ using PatternLayerMap = std::map<std::string, PatternDependency>;
 class PatternFeature  {
 public:
     using IndexType = size_t;
-
-    PatternFeature(const IndexType& i_, std::unique_ptr<GeometryTileFeature>&& feature_, const PatternLayerMap& patterns_, const float sortKey_) :
-    i(i_),
-    feature(std::move(feature_)),
-    patterns(patterns_),
-    sortKey(sortKey_)
-    {}
-
-    PatternFeature(PatternFeature&& pt) noexcept :
-    i(pt.i),
-    feature(std::move(pt.feature)),
-    patterns(pt.patterns),
-    sortKey(pt.sortKey)
-    {}
-
-    PatternFeature& operator=(PatternFeature&& pt) noexcept
-    {
+
+    PatternFeature(const IndexType& i_,
+                   std::unique_ptr<GeometryTileFeature>&& feature_,
+                   const PatternLayerMap& patterns_,
+                   const float sortKey_)
+        : i(i_), feature(std::move(feature_)), patterns(patterns_), sortKey(sortKey_) {}
+
+    PatternFeature(PatternFeature&& pt) noexcept
+        : i(pt.i), feature(std::move(pt.feature)), patterns(pt.patterns), sortKey(pt.sortKey) {}
+
+    PatternFeature& operator=(PatternFeature&& pt) noexcept {
         i = pt.i;
         feature = std::move(pt.feature);
         patterns = pt.patterns;
         sortKey = pt.sortKey;
         return *this;
     }
-
-    friend bool operator < (const PatternFeature& lhs, const PatternFeature& rhs) {
-        return lhs.sortKey < rhs.sortKey;
-    }
-
+
+    friend bool operator<(const PatternFeature& lhs, const PatternFeature& rhs) { return lhs.sortKey < rhs.sortKey; }
+
     IndexType i;
     std::unique_ptr<GeometryTileFeature> feature;
     PatternLayerMap patterns;
@@ -132,9 +124,9 @@ class PatternLayout : public Layout {
                     }
                 }
             }
-            
+
             auto sortKey = evaluateSortKey<SortKeyPropertyType>(*feature);
-            
+
             PatternFeature patternFeature{i, std::move(feature), patternDependencyMap, sortKey};
             const auto sortPosition = std::lower_bound(features.cbegin(), features.cend(), patternFeature);
             features.insert(sortPosition, std::move(patternFeature));
@@ -186,7 +178,7 @@ class PatternLayout : public Layout {
     float evaluateSortKey<void>(const GeometryTileFeature&) {
         return 0.0;
     }
-    
+
     std::map<std::string, Immutable<style::LayerProperties>> layerPropertiesMap;
     std::string bucketLeaderID;
 

src/mbgl/style/layers/fill_layer.cpp

@@ -70,8 +70,7 @@ const PropertyValue<float>& FillLayer::getFillSortKey() const {
 }
 
 void FillLayer::setFillSortKey(const PropertyValue<float>& value) {
-    if (value == getFillSortKey())
-        return;
+    if (value == getFillSortKey()) return;
     auto impl_ = mutableImpl();
     impl_->layout.get<FillSortKey>() = value;
     baseImpl = std::move(impl_);

src/mbgl/style/layers/fill_layer_impl.cpp

@@ -6,9 +6,7 @@ namespace style {
 bool FillLayer::Impl::hasLayoutDifference(const Layer::Impl& other) const {
     assert(other.getTypeInfo() == getTypeInfo());
     const auto& impl = static_cast<const style::FillLayer::Impl&>(other);
-    return filter     != impl.filter ||
-           visibility != impl.visibility ||
-           layout     != impl.layout ||
+    return filter != impl.filter || visibility != impl.visibility || layout != impl.layout ||
            paint.get<FillPattern>().value != impl.paint.get<FillPattern>().value ||
            paint.hasDataDrivenPropertyDifference(impl.paint);
 }

src/mbgl/style/layers/line_layer.cpp

@@ -134,8 +134,7 @@ const PropertyValue<float>& LineLayer::getLineSortKey() const {
 }
 
 void LineLayer::setLineSortKey(const PropertyValue<float>& value) {
-    if (value == getLineSortKey())
-        return;
+    if (value == getLineSortKey()) return;
     auto impl_ = mutableImpl();
     impl_->layout.get<LineSortKey>() = value;
     baseImpl = std::move(impl_);