11 files changed, 19 insertions, 18 deletions
diff --git a/src/mbgl/style/expression/boolean_operator.cpp b/src/mbgl/style/expression/boolean_operator.cpp
index fa472270ce..a02c08131f 100644
--- a/src/mbgl/style/expression/boolean_operator.cpp
+++ b/src/mbgl/style/expression/boolean_operator.cpp
@@ -6,8 +6,8 @@ namespace style {
 namespace expression {
 
 EvaluationResult Any::evaluate(const EvaluationContext& params) const {
-    for (auto it = inputs.begin(); it != inputs.end(); it++) {
-        const EvaluationResult result = (*it)->evaluate(params);
+    for (const auto& input : inputs) {
+        const EvaluationResult result = input->evaluate(params);
         if (!result) return result;
         if (result->get<bool>()) return EvaluationResult(true);
     }
@@ -34,8 +34,8 @@ std::vector<optional<Value>> Any::possibleOutputs() const {
 
 
 EvaluationResult All::evaluate(const EvaluationContext& params) const {
-    for (auto it = inputs.begin(); it != inputs.end(); it++) {
-        const EvaluationResult result = (*it)->evaluate(params);
+    for (const auto& input : inputs) {
+        const EvaluationResult result = input->evaluate(params);
         if (!result) return result;
         if (!result->get<bool>()) return EvaluationResult(false);
     }
diff --git a/src/mbgl/style/expression/case.cpp b/src/mbgl/style/expression/case.cpp
index 0c2ff0d7cd..314551592f 100644
--- a/src/mbgl/style/expression/case.cpp
+++ b/src/mbgl/style/expression/case.cpp
@@ -86,7 +86,7 @@ ParseResult Case::parse(const Convertible& value, ParsingContext& ctx) {
             outputType = (*output)->getType();
         }
 
-        branches.push_back(std::make_pair(std::move(*test), std::move(*output)));
+        branches.emplace_back(std::move(*test), std::move(*output));
     }
 
     assert(outputType);
diff --git a/src/mbgl/style/expression/coercion.cpp b/src/mbgl/style/expression/coercion.cpp
index 75a6056081..e0c29be1a2 100644
--- a/src/mbgl/style/expression/coercion.cpp
+++ b/src/mbgl/style/expression/coercion.cpp
@@ -113,7 +113,7 @@ mbgl::Value Coercion::serialize() const {
         // by string expressions that get implicitly coerced to "formatted".
         std::vector<mbgl::Value> serialized{{ std::string("format") }};
         serialized.push_back(inputs[0]->serialize());
-        serialized.push_back(std::unordered_map<std::string, mbgl::Value>());
+        serialized.emplace_back(std::unordered_map<std::string, mbgl::Value>());
         return serialized;
     } else {
         return Expression::serialize();
diff --git a/src/mbgl/style/expression/comparison.cpp b/src/mbgl/style/expression/comparison.cpp
index cdcdb5d59c..aa5808a975 100644
--- a/src/mbgl/style/expression/comparison.cpp
+++ b/src/mbgl/style/expression/comparison.cpp
@@ -2,6 +2,7 @@
 #include <mbgl/style/expression/comparison.hpp>
 #include <mbgl/style/expression/dsl.hpp>
 #include <mbgl/style/conversion_impl.hpp>
+#include <utility>
 
 namespace mbgl {
 namespace style {
@@ -149,7 +150,7 @@ CollatorComparison::CollatorComparison(
         std::unique_ptr<Expression> rhs_,
         std::unique_ptr<Expression> collator_)
     : Expression(Kind::Comparison, type::Boolean),
-      op(op_),
+      op(std::move(op_)),
       compare(getCollatorComparisonFunction(op)),
       lhs(std::move(lhs_)),
       rhs(std::move(rhs_)),
diff --git a/src/mbgl/style/expression/dsl.cpp b/src/mbgl/style/expression/dsl.cpp
index e7d90ba07b..b4fd8fa551 100644
--- a/src/mbgl/style/expression/dsl.cpp
+++ b/src/mbgl/style/expression/dsl.cpp
@@ -41,7 +41,7 @@ std::unique_ptr<Expression> literal(Value value) {
 std::unique_ptr<Expression> literal(std::initializer_list<double> value) {
     std::vector<Value> values;
     for (auto i : value) {
-        values.push_back(i);
+        values.emplace_back(i);
     }
     return literal(values);
 }
@@ -49,7 +49,7 @@ std::unique_ptr<Expression> literal(std::initializer_list<double> value) {
 std::unique_ptr<Expression> literal(std::initializer_list<const char *> value) {
     std::vector<Value> values;
     for (auto i : value) {
-        values.push_back(std::string(i));
+        values.emplace_back(std::string(i));
     }
     return literal(values);
 }
diff --git a/src/mbgl/style/expression/format_expression.cpp b/src/mbgl/style/expression/format_expression.cpp
index b5e4ba62c4..743942c769 100644
--- a/src/mbgl/style/expression/format_expression.cpp
+++ b/src/mbgl/style/expression/format_expression.cpp
@@ -152,7 +152,7 @@ mbgl::Value FormatExpression::serialize() const {
         if (section.textColor) {
             options.emplace(kFormattedSectionTextColor, (*section.textColor)->serialize());
         }
-        serialized.push_back(options);
+        serialized.emplace_back(options);
     }
     return serialized;
 }
diff --git a/src/mbgl/style/expression/formatted.cpp b/src/mbgl/style/expression/formatted.cpp
index 3fa39b2cdc..5d45806ecb 100644
--- a/src/mbgl/style/expression/formatted.cpp
+++ b/src/mbgl/style/expression/formatted.cpp
@@ -104,7 +104,7 @@ optional<Formatted> Converter<Formatted>::operator()(const Convertible& value, E
                 }
             }
 
-            sections.push_back(FormattedSection(*sectionText, fontScale, textFont, textColor));
+            sections.emplace_back(*sectionText, fontScale, textFont, textColor);
         }
         return Formatted(sections);
     } else if (optional<std::string> result = toString(value)) {
diff --git a/src/mbgl/style/expression/let.cpp b/src/mbgl/style/expression/let.cpp
index 592ceed58a..5acd52f578 100644
--- a/src/mbgl/style/expression/let.cpp
+++ b/src/mbgl/style/expression/let.cpp
@@ -12,8 +12,8 @@ EvaluationResult Let::evaluate(const EvaluationContext& params) const {
 }
 
 void Let::eachChild(const std::function<void(const Expression&)>& visit) const {
-    for (auto it = bindings.begin(); it != bindings.end(); it++) {
-        visit(*it->second);
+    for (const auto& binding : bindings) {
+        visit(*binding.second);
     }
     visit(*result);
 }
diff --git a/src/mbgl/style/expression/match.cpp b/src/mbgl/style/expression/match.cpp
index 93627e9df1..70d3ac8d6d 100644
--- a/src/mbgl/style/expression/match.cpp
+++ b/src/mbgl/style/expression/match.cpp
@@ -287,7 +287,7 @@ ParseResult parseMatch(const Convertible& value, ParsingContext& ctx) {
             outputType = (*output)->getType();
         }
         
-        branches.push_back(std::make_pair(std::move(labels), std::move(*output)));
+        branches.emplace_back(std::move(labels), std::move(*output));
     }
 
     auto input = ctx.parse(arrayMember(value, 1), 1, {type::Value});
diff --git a/src/mbgl/style/expression/step.cpp b/src/mbgl/style/expression/step.cpp
index 39b04c04a0..170e84bfc6 100644
--- a/src/mbgl/style/expression/step.cpp
+++ b/src/mbgl/style/expression/step.cpp
@@ -46,13 +46,13 @@ EvaluationResult Step::evaluate(const EvaluationContext& params) const {
 
 void Step::eachChild(const std::function<void(const Expression&)>& visit) const {
     visit(*input);
-    for (auto it = stops.begin(); it != stops.end(); it++) {
-        visit(*it->second);
+    for (const auto& stop : stops) {
+        visit(*stop.second);
     }
 }
 
 void Step::eachStop(const std::function<void(double, const Expression&)>& visit) const {
-    for (const auto &stop : stops) {
+    for (const auto& stop : stops) {
         visit(stop.first, *stop.second);
     }
 }
diff --git a/src/mbgl/style/expression/value.cpp b/src/mbgl/style/expression/value.cpp
index e826a8a3cc..7e11efaa09 100644
--- a/src/mbgl/style/expression/value.cpp
+++ b/src/mbgl/style/expression/value.cpp
@@ -171,7 +171,7 @@ mbgl::Value ValueConverter<mbgl::Value>::fromExpressionValue(const Value& value)
                     options.emplace("text-color", fromExpressionValue(*section.textColor));
                 }
 
-                serialized.push_back(options);
+                serialized.emplace_back(options);
             }
             return serialized;
         },