Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history 
for more information, see https://pre-commit.ci
  • Loading branch information
@pre-commit-ci
pre-commit-ci[bot] committed May 9, 2023
1 parent 7a70a97 commit 0f7c1ab
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 68 deletions.
6 changes: 4 additions & 2 deletions platform/default/src/mbgl/storage/offline_download.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ OfflineRegionStatus OfflineDownload::getStatus() const {

auto handleTiledSource = [&](const std::variant<std::string, Tileset>& urlOrTileset, const uint16_t tileSize) {
if (std::holds_alternative<Tileset>(urlOrTileset)) {
uint64_t tileSourceCount = tileCount(definition, type, tileSize, std::get<Tileset>(urlOrTileset).zoomRange);
uint64_t tileSourceCount = tileCount(
definition, type, tileSize, std::get<Tileset>(urlOrTileset).zoomRange);
result->requiredTileCount += tileSourceCount;
result->requiredResourceCount += tileSourceCount;
} else {
Expand Down Expand Up @@ -252,7 +253,8 @@ void OfflineDownload::activateDownload() {
for (const auto& source : parser.sources) {
SourceType type = source->getType();

auto handleTiledSource = [&](const std::variant<std::string, Tileset>& urlOrTileset, const uint16_t tileSize) {
auto handleTiledSource = [&](const std::variant<std::string, Tileset>& urlOrTileset,
const uint16_t tileSize) {
if (std::holds_alternative<Tileset>(urlOrTileset)) {
queueTiles(type, tileSize, std::get<Tileset>(urlOrTileset));
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/mbgl/gfx/color_mode.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class ColorMode {
using Subtract = LinearBlend<ColorBlendEquationType::Subtract>;
using ReverseSubtract = LinearBlend<ColorBlendEquationType::ReverseSubtract>;

using BlendFunction = std::variant< Replace, Add, Subtract, ReverseSubtract>;
using BlendFunction = std::variant<Replace, Add, Subtract, ReverseSubtract>;

BlendFunction blendFunction;
Color blendColor;
Expand Down
2 changes: 1 addition & 1 deletion src/mbgl/gfx/stencil_mode.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class StencilMode {
using GreaterEqual = MaskedTest<StencilFunctionType::GreaterEqual>;
using Always = SimpleTest<StencilFunctionType::Always>;

using Test = std::variant< Never, Less, Equal, LessEqual, Greater, NotEqual, GreaterEqual, Always>;
using Test = std::variant<Never, Less, Equal, LessEqual, Greater, NotEqual, GreaterEqual, Always>;

Test test;
int32_t ref;
Expand Down
14 changes: 8 additions & 6 deletions src/mbgl/gl/context.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,8 +508,8 @@ void Context::setStencilMode(const gfx::StencilMode& stencil) {
} else {
stencilTest = true;
stencilMask = stencil.mask;
stencilOp = { stencil.fail, stencil.depthFail, stencil.pass };
std::visit([&](const auto& test) { stencilFunc = { test.func, stencil.ref, test.mask }; }, stencil.test);
stencilOp = {stencil.fail, stencil.depthFail, stencil.pass};
std::visit([&](const auto& test) { stencilFunc = {test.func, stencil.ref, test.mask}; }, stencil.test);
}
}

Expand All @@ -519,10 +519,12 @@ void Context::setColorMode(const gfx::ColorMode& color) {
} else {
blend = true;
blendColor = color.blendColor;
std::visit([&] (const auto& blendFunction) {
blendEquation = gfx::ColorBlendEquationType(blendFunction.equation);
blendFunc = { blendFunction.srcFactor, blendFunction.dstFactor };
}, color.blendFunction);
std::visit(
[&](const auto& blendFunction) {
blendEquation = gfx::ColorBlendEquationType(blendFunction.equation);
blendFunc = {blendFunction.srcFactor, blendFunction.dstFactor};
},
color.blendFunction);
}

colorMask = color.mask;
Expand Down
24 changes: 12 additions & 12 deletions src/mbgl/renderer/possibly_evaluated_property_value.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ class PossiblyEvaluatedPropertyValue {
bool isConstant() const { return std::holds_alternative<T>(value); }

std::optional<T> constant() const {
return std::visit(util::Overloaded{
[&] (const T& t) { return std::optional<T>(t); },
[&] (const auto&) { return std::optional<T>(); }},
value);
return std::visit(util::Overloaded{[&](const T& t) { return std::optional<T>(t); },
[&](const auto&) {
return std::optional<T>();
}},
value);
}

T constantOr(const T& t) const { return constant().value_or(t); }
Expand Down Expand Up @@ -67,7 +68,7 @@ class PossiblyEvaluatedPropertyValue {
template <class T>
class PossiblyEvaluatedPropertyValue<Faded<T>> {
private:
using Value = std::variant< Faded<T>, style::PropertyExpression<T>>;
using Value = std::variant<Faded<T>, style::PropertyExpression<T>>;

Value value;

Expand All @@ -76,15 +77,14 @@ class PossiblyEvaluatedPropertyValue<Faded<T>> {
PossiblyEvaluatedPropertyValue(Value v)
: value(std::move(v)) {}

bool isConstant() const {
return std::holds_alternative<Faded<T>>(value);
}
bool isConstant() const { return std::holds_alternative<Faded<T>>(value); }

std::optional<Faded<T>> constant() const {
return std::visit(util::Overloaded{
[&] (const Faded<T>& t) { return std::optional<Faded<T>>(t); },
[&] (const auto&) { return std::optional<Faded<T>>(); }},
value);
return std::visit(util::Overloaded{[&](const Faded<T>& t) { return std::optional<Faded<T>>(t); },
[&](const auto&) {
return std::optional<Faded<T>>();
}},
value);
}

Faded<T> constantOr(const Faded<T>& t) const { return constant().value_or(t); }
Expand Down
78 changes: 39 additions & 39 deletions src/mbgl/style/expression/compound_expression.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ struct SignatureBase {
SignatureBase(type::Type result_, std::variant<std::vector<type::Type>, VarargsType> params_, std::string name_)
: result(std::move(result_)),
params(std::move(params_)),
name(std::move(name_))
{}
name(std::move(name_)) {}
virtual ~SignatureBase() = default;

virtual EvaluationResult apply(const EvaluationContext&, const Args&) const = 0;
Expand Down Expand Up @@ -1001,32 +1000,32 @@ std::string expectedTypesError(const Definitions& definitions, const std::vector
std::vector<std::string> overloads;
for (auto it = definitions.first; it != definitions.second; ++it) {
const auto& signature = it->second();
std::visit(util::Overloaded{
[&](const VarargsType& varargs) {
std::string overload = "(" + toString(varargs.type) + ")";
overloads.push_back(overload);
},
[&](const std::vector<type::Type>& params) {
std::string overload = "(";
bool first = true;
for (const type::Type& param : params) {
if (!first) overload += ", ";
overload += toString(param);
first = false;
}
overload += ")";
if (params.size() == args.size()) {
overloads.push_back(overload);
} else {
availableOverloads.push_back(overload);
}
overload += ")";
if (params.size() == args.size()) {
overloads.push_back(overload);
} else {
availableOverloads.push_back(overload);
}}},
signature->params);
std::visit(util::Overloaded{[&](const VarargsType& varargs) {
std::string overload = "(" + toString(varargs.type) + ")";
overloads.push_back(overload);
},
[&](const std::vector<type::Type>& params) {
std::string overload = "(";
bool first = true;
for (const type::Type& param : params) {
if (!first) overload += ", ";
overload += toString(param);
first = false;
}
overload += ")";
if (params.size() == args.size()) {
overloads.push_back(overload);
} else {
availableOverloads.push_back(overload);
}
overload += ")";
if (params.size() == args.size()) {
overloads.push_back(overload);
} else {
availableOverloads.push_back(overload);
}
}},
signature->params);
}
std::string signatures = overloads.empty() ? boost::algorithm::join(availableOverloads, " | ")
: boost::algorithm::join(overloads, " | ");
Expand Down Expand Up @@ -1106,8 +1105,7 @@ ParseResult parseCompoundExpression(const std::string& name, const Convertible&
const auto& signature = it->second();

if (std::holds_alternative<VarargsType>(signature->params) ||
std::get<std::vector<type::Type>>(signature->params).size() == length - 1
) {
std::get<std::vector<type::Type>>(signature->params).size() == length - 1) {
// First parse all the args, potentially coercing to the
// types expected by this overload.
ctx.clearErrors();
Expand All @@ -1116,11 +1114,12 @@ ParseResult parseCompoundExpression(const std::string& name, const Convertible&
args.reserve(length - 1);

for (std::size_t i = 1; i < length; i++) {
std::optional<type::Type> expected = std::visit(util::Overloaded{
[](const VarargsType& varargs) { return varargs.type; },
[&](const std::vector<type::Type>& params_) { return params_[i - 1]; }},
signature->params
);
std::optional<type::Type> expected = std::visit(
util::Overloaded{[](const VarargsType& varargs) { return varargs.type; },
[&](const std::vector<type::Type>& params_) {
return params_[i - 1];
}},
signature->params);

auto parsed = ctx.parse(arrayMember(value, i), i, expected);
if (!parsed) {
Expand Down Expand Up @@ -1181,10 +1180,11 @@ EvaluationResult CompoundExpression::evaluate(const EvaluationContext& evaluatio
}

std::optional<std::size_t> CompoundExpression::getParameterCount() const {
return std::visit(util::Overloaded{
[&](const VarargsType&) -> std::optional<std::size_t> { return std::nullopt; },
[&](const std::vector<type::Type>& p) -> std::optional<std::size_t> { return p.size(); }},
signature.params);
return std::visit(util::Overloaded{[&](const VarargsType&) -> std::optional<std::size_t> { return std::nullopt; },
[&](const std::vector<type::Type>& p) -> std::optional<std::size_t> {
return p.size();
}},
signature.params);
}

std::vector<std::optional<Value>> CompoundExpression::possibleOutputs() const {
Expand Down
8 changes: 3 additions & 5 deletions src/mbgl/util/overloaded.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#pragma once

namespace mbgl
{
namespace util
{

namespace mbgl {
namespace util {

template <typename... Ts>
struct Overloaded : Ts... {
using Ts::operator()...;
Expand Down
3 changes: 1 addition & 2 deletions test/algorithm/update_renderables.test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ std::ostream& operator<<(std::ostream& os, const RenderTileAction& action) {
<< action.tileData.tileID.canonical.y << " }\n";
}

using ActionLogEntry =
std::variant<GetTileDataAction, CreateTileDataAction, RetainTileDataAction, RenderTileAction>;
using ActionLogEntry = std::variant<GetTileDataAction, CreateTileDataAction, RetainTileDataAction, RenderTileAction>;
using ActionLog = std::vector<ActionLogEntry>;

template <typename T>
Expand Down

0 comments on commit 0f7c1ab

Please sign in to comment.