From 8a029e3042e59fd461eb0fa094d1a990fc2e60e6 Mon Sep 17 00:00:00 2001 From: martin nylin Date: Sun, 14 Sep 2025 11:28:40 +0200 Subject: [PATCH] Upgrade clang-format from version 15 to 19 --- .github/workflows/osrm-backend.yml | 4 +- CHANGELOG.md | 1 + .../contractor/contract_excludable_graph.hpp | 11 ++--- include/contractor/query_edge.hpp | 4 +- include/engine/api/base_api.hpp | 16 +++---- include/engine/api/match_parameters.hpp | 5 +- include/engine/api/route_parameters.hpp | 12 ++--- include/engine/api/trip_parameters.hpp | 4 +- include/engine/phantom_node.hpp | 9 ++-- include/engine/plugins/plugin_base.hpp | 2 +- .../routing_algorithms/many_to_many.hpp | 2 +- .../routing_algorithms/routing_base_mld.hpp | 13 +++--- include/extractor/edge_based_node_segment.hpp | 5 +- include/partitioner/bisection_graph.hpp | 4 +- include/partitioner/cell_storage.hpp | 12 ++--- .../partitioner/edge_based_graph_reader.hpp | 46 +++++++++---------- include/partitioner/multi_level_graph.hpp | 3 +- include/partitioner/remove_unconnected.hpp | 14 +++--- .../server/api/base_parameters_grammar.hpp | 19 ++++---- include/storage/shared_datatype.hpp | 3 +- include/updater/csv_file_parser.hpp | 3 +- include/util/deallocating_vector.hpp | 4 +- include/util/packed_vector.hpp | 2 +- scripts/format.sh | 10 ++-- src/engine/api/json_factory.cpp | 12 ++--- src/engine/plugins/viaroute.cpp | 28 +++++------ src/extractor/edge_based_graph_factory.cpp | 5 +- src/guidance/turn_handler.cpp | 11 ++--- src/partitioner/dinic_max_flow.cpp | 20 ++++---- src/partitioner/recursive_bisection.cpp | 5 +- src/util/guidance/bearing_class.cpp | 3 +- unit_tests/extractor/restriction_graph.cpp | 12 ++--- 32 files changed, 149 insertions(+), 155 deletions(-) diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 34c50016eda..16268bcdf2d 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -94,7 +94,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} format-taginfo-docs: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.10 steps: - uses: actions/checkout@v4 - name: Use Node.js @@ -111,7 +111,7 @@ jobs: - name: Prepare environment run: | npm ci --ignore-scripts - clang-format-15 --version + clang-format-19 --version - name: Run checks run: | ./scripts/check_taginfo.py taginfo.json profiles/car.lua diff --git a/CHANGELOG.md b/CHANGELOG.md index ded7286cbb8..5ed0cbafa97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Unreleased - Changes from 6.0.0 - Misc: + - CHANGED: Upgrade from clang-format-15 to clang-format-19 [#7249](https://github.com/Project-OSRM/osrm-backend/issues/7249) - ADDED: Add husky pre-commit hook for compiling and linting staged JS files [#7228](https://github.com/Project-OSRM/osrm-backend/issues/7228) - CHANGED: Standardize linting configuration with ESM-specific rules [#7229](https://github.com/Project-OSRM/osrm-backend/issues/7229) - CHANGED: Convert scripts from CommonJS to modern ESM format [#7230](https://github.com/Project-OSRM/osrm-backend/pull/7230) diff --git a/include/contractor/contract_excludable_graph.hpp b/include/contractor/contract_excludable_graph.hpp index 75e3aceda0f..23b1a6b2e43 100644 --- a/include/contractor/contract_excludable_graph.hpp +++ b/include/contractor/contract_excludable_graph.hpp @@ -61,12 +61,11 @@ inline auto contractExcludableGraph(ContractorGraph contractor_graph_, // Add all non-core edges to container { auto non_core_edges = toEdges(contractor_graph); - auto new_end = std::remove_if(non_core_edges.begin(), - non_core_edges.end(), - [&](const auto &edge) { - return is_shared_core[edge.source] && - is_shared_core[edge.target]; - }); + auto new_end = std::remove_if( + non_core_edges.begin(), + non_core_edges.end(), + [&](const auto &edge) + { return is_shared_core[edge.source] && is_shared_core[edge.target]; }); non_core_edges.resize(new_end - non_core_edges.begin()); edge_container.Insert(std::move(non_core_edges)); diff --git a/include/contractor/query_edge.hpp b/include/contractor/query_edge.hpp index 3776aab185a..c3056f35543 100644 --- a/include/contractor/query_edge.hpp +++ b/include/contractor/query_edge.hpp @@ -15,8 +15,8 @@ struct QueryEdge struct EdgeData { explicit EdgeData() - : turn_id(0), shortcut(false), weight{0}, duration(0), forward(false), - backward(false), distance{0} + : turn_id(0), shortcut(false), weight{0}, duration(0), forward(false), backward(false), + distance{0} { } diff --git a/include/engine/api/base_api.hpp b/include/engine/api/base_api.hpp index 4daadfc0354..fc0a86e7fa1 100644 --- a/include/engine/api/base_api.hpp +++ b/include/engine/api/base_api.hpp @@ -47,7 +47,8 @@ class BaseAPI util::json::Object MakeWaypoint(const PhantomNodeCandidates &candidates) const { // TODO: check forward/reverse - const auto toName = [this](const auto &phantom) { + const auto toName = [this](const auto &phantom) + { return std::string( facade.GetNameForID(facade.GetNameIndex(phantom.forward_segment_id.id))); }; @@ -67,9 +68,8 @@ class BaseAPI std::transform(candidates.begin(), candidates.end(), seg_hints.begin(), - [this](const auto &phantom) { - return SegmentHint{phantom, facade.GetCheckSum()}; - }); + [this](const auto &phantom) + { return SegmentHint{phantom, facade.GetCheckSum()}; }); return json::makeWaypoint( snapped_location, @@ -115,7 +115,8 @@ class BaseAPI static_cast(static_cast(util::toFloating(snapped_location.lon))), static_cast(static_cast(util::toFloating(snapped_location.lat)))); - const auto toName = [this](const auto &phantom) { + const auto toName = [this](const auto &phantom) + { return std::string( facade.GetNameForID(facade.GetNameIndex(phantom.forward_segment_id.id))); }; @@ -135,9 +136,8 @@ class BaseAPI std::transform(candidates.begin(), candidates.end(), seg_hints.begin(), - [this](const auto &phantom) { - return SegmentHint{phantom, facade.GetCheckSum()}; - }); + [this](const auto &phantom) + { return SegmentHint{phantom, facade.GetCheckSum()}; }); Hint hint{std::move(seg_hints)}; hint_string = builder->CreateString(hint.ToBase64()); } diff --git a/include/engine/api/match_parameters.hpp b/include/engine/api/match_parameters.hpp index abc93a650a2..6f5563f901a 100644 --- a/include/engine/api/match_parameters.hpp +++ b/include/engine/api/match_parameters.hpp @@ -78,9 +78,8 @@ struct MatchParameters : public RouteParameters bool tidy_, const std::vector &waypoints_, Args &&...args_) - : RouteParameters{std::forward(args_)..., waypoints_}, timestamps{std::move( - timestamps_)}, - gaps(gaps_), tidy(tidy_) + : RouteParameters{std::forward(args_)..., waypoints_}, + timestamps{std::move(timestamps_)}, gaps(gaps_), tidy(tidy_) { } diff --git a/include/engine/api/route_parameters.hpp b/include/engine/api/route_parameters.hpp index a28f34b8c7c..d4db0fb8037 100644 --- a/include/engine/api/route_parameters.hpp +++ b/include/engine/api/route_parameters.hpp @@ -141,8 +141,8 @@ struct RouteParameters : public BaseParameters : BaseParameters{std::forward(args_)...}, steps{steps_}, alternatives{alternatives_}, number_of_alternatives{alternatives_ ? 1u : 0u}, annotations{annotations_}, annotations_type{annotations_ ? AnnotationsType::All : AnnotationsType::None}, - geometries{geometries_}, overview{overview_}, - continue_straight{continue_straight_}, waypoints{std::move(waypoints_)} + geometries{geometries_}, overview{overview_}, continue_straight{continue_straight_}, + waypoints{std::move(waypoints_)} { } @@ -157,10 +157,10 @@ struct RouteParameters : public BaseParameters std::vector waypoints_, Args &&...args_) : BaseParameters{std::forward(args_)...}, steps{steps_}, alternatives{alternatives_}, - number_of_alternatives{alternatives_ ? 1u : 0u}, annotations{annotations_ != - AnnotationsType::None}, - annotations_type{annotations_}, geometries{geometries_}, overview{overview_}, - continue_straight{continue_straight_}, waypoints{std::move(waypoints_)} + number_of_alternatives{alternatives_ ? 1u : 0u}, + annotations{annotations_ != AnnotationsType::None}, annotations_type{annotations_}, + geometries{geometries_}, overview{overview_}, continue_straight{continue_straight_}, + waypoints{std::move(waypoints_)} { } diff --git a/include/engine/api/trip_parameters.hpp b/include/engine/api/trip_parameters.hpp index 8d28e880f12..a6a995c8f20 100644 --- a/include/engine/api/trip_parameters.hpp +++ b/include/engine/api/trip_parameters.hpp @@ -60,8 +60,8 @@ struct TripParameters : public RouteParameters DestinationType destination_, bool roundtrip_, Args &&...args_) - : RouteParameters{std::forward(args_)...}, source{source_}, - destination{destination_}, roundtrip{roundtrip_} + : RouteParameters{std::forward(args_)...}, source{source_}, destination{destination_}, + roundtrip{roundtrip_} { } diff --git a/include/engine/phantom_node.hpp b/include/engine/phantom_node.hpp index c7d0c0bf2a3..3ddfaa2a55a 100644 --- a/include/engine/phantom_node.hpp +++ b/include/engine/phantom_node.hpp @@ -44,16 +44,15 @@ namespace osrm::engine struct PhantomNode { PhantomNode() - : forward_segment_id{SPECIAL_SEGMENTID, false}, reverse_segment_id{SPECIAL_SEGMENTID, - false}, - forward_weight(INVALID_EDGE_WEIGHT), + : forward_segment_id{SPECIAL_SEGMENTID, false}, + reverse_segment_id{SPECIAL_SEGMENTID, false}, forward_weight(INVALID_EDGE_WEIGHT), reverse_weight(INVALID_EDGE_WEIGHT), forward_weight_offset{0}, reverse_weight_offset{0}, forward_distance(INVALID_EDGE_DISTANCE), reverse_distance(INVALID_EDGE_DISTANCE), forward_distance_offset{0}, reverse_distance_offset{0}, forward_duration(MAXIMAL_EDGE_DURATION), reverse_duration(MAXIMAL_EDGE_DURATION), forward_duration_offset{0}, reverse_duration_offset{0}, - component({INVALID_COMPONENTID, 0}), - fwd_segment_position(0), is_valid_forward_source{false}, is_valid_forward_target{false}, + component({INVALID_COMPONENTID, 0}), fwd_segment_position(0), + is_valid_forward_source{false}, is_valid_forward_target{false}, is_valid_reverse_source{false}, is_valid_reverse_target{false}, bearing(0) { diff --git a/include/engine/plugins/plugin_base.hpp b/include/engine/plugins/plugin_base.hpp index fbda1566413..2739ff79bc3 100644 --- a/include/engine/plugins/plugin_base.hpp +++ b/include/engine/plugins/plugin_base.hpp @@ -70,7 +70,7 @@ class BasePlugin std::string message; ErrorRenderer(std::string code, std::string message) - : code(std::move(code)), message(std::move(message)){}; + : code(std::move(code)), message(std::move(message)) {}; void operator()(util::json::Object &json_result) { diff --git a/include/engine/routing_algorithms/many_to_many.hpp b/include/engine/routing_algorithms/many_to_many.hpp index 61398078440..175c71b32e5 100644 --- a/include/engine/routing_algorithms/many_to_many.hpp +++ b/include/engine/routing_algorithms/many_to_many.hpp @@ -71,7 +71,7 @@ struct NodeBucket { unsigned column_idx; - ColumnCompare(unsigned column_idx) : column_idx(column_idx){}; + ColumnCompare(unsigned column_idx) : column_idx(column_idx) {}; bool operator()(const NodeBucket &lhs, const NodeID &rhs) const // lowerbound { diff --git a/include/engine/routing_algorithms/routing_base_mld.hpp b/include/engine/routing_algorithms/routing_base_mld.hpp index aedbcf75add..8170ad40d1d 100644 --- a/include/engine/routing_algorithms/routing_base_mld.hpp +++ b/include/engine/routing_algorithms/routing_base_mld.hpp @@ -86,7 +86,8 @@ inline LevelID getNodeQueryLevel(const MultiLevelPartition &partition, std::accumulate(endpoint_candidates.target_phantoms.begin(), endpoint_candidates.target_phantoms.end(), level_1, - [&](LevelID level_2, const PhantomNode &target) { + [&](LevelID level_2, const PhantomNode &target) + { return std::min( level_2, getNodeQueryLevel(partition, node, source, target)); @@ -312,7 +313,7 @@ void relaxOutgoingEdges(const DataFacade &facade, const auto &cell = cells.GetCell(metric, level, partition.GetCell(level, heapNode.node)); auto destination = cell.GetDestinationNodes().begin(); - auto distance = [&cell, node = heapNode.node ]() -> auto + auto distance = [&cell, node = heapNode.node]() -> auto { if constexpr (IS_MAP_MATCHING) { @@ -324,8 +325,7 @@ void relaxOutgoingEdges(const DataFacade &facade, boost::ignore_unused(cell, node); return 0; } - } - (); + }(); for (auto shortcut_weight : cell.GetOutWeight(heapNode.node)) { BOOST_ASSERT(destination != cell.GetDestinationNodes().end()); @@ -360,7 +360,7 @@ void relaxOutgoingEdges(const DataFacade &facade, const auto &cell = cells.GetCell(metric, level, partition.GetCell(level, heapNode.node)); auto source = cell.GetSourceNodes().begin(); - auto distance = [&cell, node = heapNode.node ]() -> auto + auto distance = [&cell, node = heapNode.node]() -> auto { if constexpr (IS_MAP_MATCHING) { @@ -372,8 +372,7 @@ void relaxOutgoingEdges(const DataFacade &facade, boost::ignore_unused(cell, node); return 0; } - } - (); + }(); for (auto shortcut_weight : cell.GetInWeight(heapNode.node)) { BOOST_ASSERT(source != cell.GetSourceNodes().end()); diff --git a/include/extractor/edge_based_node_segment.hpp b/include/extractor/edge_based_node_segment.hpp index 3bbe6c8f9c0..c3c3937c87a 100644 --- a/include/extractor/edge_based_node_segment.hpp +++ b/include/extractor/edge_based_node_segment.hpp @@ -18,9 +18,8 @@ namespace osrm::extractor struct EdgeBasedNodeSegment { EdgeBasedNodeSegment() - : forward_segment_id{SPECIAL_SEGMENTID, false}, reverse_segment_id{SPECIAL_SEGMENTID, - false}, - u(SPECIAL_NODEID), v(SPECIAL_NODEID), + : forward_segment_id{SPECIAL_SEGMENTID, false}, + reverse_segment_id{SPECIAL_SEGMENTID, false}, u(SPECIAL_NODEID), v(SPECIAL_NODEID), fwd_segment_position(std::numeric_limits::max() >> 1), // >> 1 because we've only got 15 bits is_startpoint(false) diff --git a/include/partitioner/bisection_graph.hpp b/include/partitioner/bisection_graph.hpp index 52139a85c9b..2f88733f4e0 100644 --- a/include/partitioner/bisection_graph.hpp +++ b/include/partitioner/bisection_graph.hpp @@ -105,9 +105,7 @@ std::vector adaptToBisectionEdge(std::vector edge std::transform(begin(edges), end(edges), std::back_inserter(result), - [](const auto &edge) { - return BisectionInputEdge{edge.source, edge.target}; - }); + [](const auto &edge) { return BisectionInputEdge{edge.source, edge.target}; }); return result; } diff --git a/include/partitioner/cell_storage.hpp b/include/partitioner/cell_storage.hpp index 268fc9115f7..1366d281b86 100644 --- a/include/partitioner/cell_storage.hpp +++ b/include/partitioner/cell_storage.hpp @@ -187,10 +187,10 @@ template class CellStorageImpl const NodeID *const all_sources, const NodeID *const all_destinations) : num_source_nodes{data.num_source_nodes}, - num_destination_nodes{data.num_destination_nodes}, weights{all_weights + - data.value_offset}, - durations{all_durations + data.value_offset}, distances{all_distances + - data.value_offset}, + num_destination_nodes{data.num_destination_nodes}, + weights{all_weights + data.value_offset}, + durations{all_durations + data.value_offset}, + distances{all_distances + data.value_offset}, source_boundary{all_sources + data.source_boundary_offset}, destination_boundary{all_destinations + data.destination_boundary_offset} { @@ -208,8 +208,8 @@ template class CellStorageImpl const NodeID *const all_destinations) : num_source_nodes{data.num_source_nodes}, num_destination_nodes{data.num_destination_nodes}, weights{nullptr}, - durations{nullptr}, distances{nullptr}, source_boundary{all_sources + - data.source_boundary_offset}, + durations{nullptr}, distances{nullptr}, + source_boundary{all_sources + data.source_boundary_offset}, destination_boundary{all_destinations + data.destination_boundary_offset} { BOOST_ASSERT(num_source_nodes == 0 || all_sources != nullptr); diff --git a/include/partitioner/edge_based_graph_reader.hpp b/include/partitioner/edge_based_graph_reader.hpp index 0a928a03362..b2ac677fdf1 100644 --- a/include/partitioner/edge_based_graph_reader.hpp +++ b/include/partitioner/edge_based_graph_reader.hpp @@ -163,29 +163,29 @@ graphToEdges(const DynamicEdgeBasedGraph &edge_based_graph) [](const NodeID lhs, const NodeID rhs) { return std::max(lhs, rhs); }); std::vector edges(max_turn_id + 1); - tbb::parallel_for( - range, - [&](const auto range) - { - for (auto node = range.begin(); node < range.end(); ++node) - { - for (auto edge : edge_based_graph.GetAdjacentEdgeRange(node)) - { - const auto &data = edge_based_graph.GetEdgeData(edge); - // we only need to save the forward edges, since the read method - // will convert from forward to bi-directional edges again - if (data.forward) - { - auto target = edge_based_graph.GetTarget(edge); - BOOST_ASSERT(data.turn_id <= max_turn_id); - edges[data.turn_id] = extractor::EdgeBasedEdge{node, target, data}; - // only save the forward edge - edges[data.turn_id].data.forward = true; - edges[data.turn_id].data.backward = false; - } - } - } - }); + tbb::parallel_for(range, + [&](const auto range) + { + for (auto node = range.begin(); node < range.end(); ++node) + { + for (auto edge : edge_based_graph.GetAdjacentEdgeRange(node)) + { + const auto &data = edge_based_graph.GetEdgeData(edge); + // we only need to save the forward edges, since the read method + // will convert from forward to bi-directional edges again + if (data.forward) + { + auto target = edge_based_graph.GetTarget(edge); + BOOST_ASSERT(data.turn_id <= max_turn_id); + edges[data.turn_id] = + extractor::EdgeBasedEdge{node, target, data}; + // only save the forward edge + edges[data.turn_id].data.forward = true; + edges[data.turn_id].data.backward = false; + } + } + } + }); return edges; } diff --git a/include/partitioner/multi_level_graph.hpp b/include/partitioner/multi_level_graph.hpp index 0c1c8d75d8e..3821fb63360 100644 --- a/include/partitioner/multi_level_graph.hpp +++ b/include/partitioner/multi_level_graph.hpp @@ -205,7 +205,8 @@ class MultiLevelGraph : public util::StaticGraph { iter = std::find_if(iter, edge_and_level_end, - [node, level](const auto &edge_and_level) { + [node, level](const auto &edge_and_level) + { return boost::get<0>(edge_and_level).source != node || boost::get<1>(edge_and_level) != level; }); diff --git a/include/partitioner/remove_unconnected.hpp b/include/partitioner/remove_unconnected.hpp index 1b0c9963f67..b5be6692b6a 100644 --- a/include/partitioner/remove_unconnected.hpp +++ b/include/partitioner/remove_unconnected.hpp @@ -62,7 +62,8 @@ std::size_t removeUnconnectedBoundaryNodes(const GraphT &edge_based_graph, auto new_end = std::remove_if(witnesses.begin(), witnesses.end(), - [&](const auto &witness) { + [&](const auto &witness) + { return partitions[level_index + 1][node] != partitions[level_index + 1][witness.id]; }); @@ -89,12 +90,11 @@ std::size_t removeUnconnectedBoundaryNodes(const GraphT &edge_based_graph, } } - auto best_witness = - std::min_element(witnesses.begin(), - witnesses.end(), - [](const auto &lhs, const auto &rhs) { - return lhs.induced_border_edges < rhs.induced_border_edges; - }); + auto best_witness = std::min_element( + witnesses.begin(), + witnesses.end(), + [](const auto &lhs, const auto &rhs) + { return lhs.induced_border_edges < rhs.induced_border_edges; }); BOOST_ASSERT(best_witness != witnesses.end()); // assign `node` to same subcells as `best_witness` diff --git a/include/server/api/base_parameters_grammar.hpp b/include/server/api/base_parameters_grammar.hpp index 0891439e9a6..d73661b6f93 100644 --- a/include/server/api/base_parameters_grammar.hpp +++ b/include/server/api/base_parameters_grammar.hpp @@ -106,13 +106,15 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar }; const auto add_approach = [](engine::api::BaseParameters &base_parameters, - boost::optional approach) { + boost::optional approach) + { base_parameters.approaches.push_back(approach ? std::make_optional(*approach) : std::nullopt); }; - const auto add_radius = [](engine::api::BaseParameters &base_parameters, - boost::optional radius) { + const auto add_radius = + [](engine::api::BaseParameters &base_parameters, boost::optional radius) + { base_parameters.radiuses.push_back(radius ? std::make_optional(*radius) : std::nullopt); }; @@ -121,12 +123,11 @@ struct BaseParametersGrammar : boost::spirit::qi::grammar unlimited_rule = qi::lit("unlimited")[qi::_val = std::numeric_limits::infinity()]; bearing_rule = - (qi::short_ > ',' > qi::short_)[qi::_val = ph::bind( - [](short bearing, short range) { - return osrm::engine::Bearing{bearing, range}; - }, - qi::_1, - qi::_2)]; + (qi::short_ > ',' > + qi::short_)[qi::_val = ph::bind([](short bearing, short range) + { return osrm::engine::Bearing{bearing, range}; }, + qi::_1, + qi::_2)]; location_rule = (double_ > qi::lit(',') > double_)[qi::_val = ph::bind( diff --git a/include/storage/shared_datatype.hpp b/include/storage/shared_datatype.hpp index d9c6670d958..86760c035cd 100644 --- a/include/storage/shared_datatype.hpp +++ b/include/storage/shared_datatype.hpp @@ -224,7 +224,8 @@ struct SharedRegionRegister auto iter = std::find_if( regions.begin(), regions.end(), - [&](const auto ®ion) { + [&](const auto ®ion) + { return std::strncmp(region.name, name.c_str(), SharedRegion::MAX_NAME_LENGTH) == 0; }); diff --git a/include/updater/csv_file_parser.hpp b/include/updater/csv_file_parser.hpp index 037f5b4ec91..1cfac1bc57b 100644 --- a/include/updater/csv_file_parser.hpp +++ b/include/updater/csv_file_parser.hpp @@ -64,7 +64,8 @@ template struct CSVFilesParser // The operands order is swapped to make descending ordering on (key, source) tbb::parallel_sort(begin(lookup), end(lookup), - [](const auto &lhs, const auto &rhs) { + [](const auto &lhs, const auto &rhs) + { return std::tie(rhs.first, rhs.second.source) < std::tie(lhs.first, lhs.second.source); }); diff --git a/include/util/deallocating_vector.hpp b/include/util/deallocating_vector.hpp index 32a21650d39..bd9caa6e667 100644 --- a/include/util/deallocating_vector.hpp +++ b/include/util/deallocating_vector.hpp @@ -268,9 +268,7 @@ template class DeallocatingVector ++current_size; } - void reserve(const std::size_t) const - { /* don't do anything */ - } + void reserve(const std::size_t) const { /* don't do anything */ } void resize(const std::size_t new_size) { diff --git a/include/util/packed_vector.hpp b/include/util/packed_vector.hpp index 22a234419fe..cb31ac45e0c 100644 --- a/include/util/packed_vector.hpp +++ b/include/util/packed_vector.hpp @@ -370,7 +370,7 @@ template class Pack push_back(value); } - PackedVector(){}; + PackedVector() {}; PackedVector(const PackedVector &) = default; PackedVector(PackedVector &&) = default; PackedVector &operator=(const PackedVector &) = default; diff --git a/scripts/format.sh b/scripts/format.sh index 93e6a50f9e3..19b7c6c4090 100755 --- a/scripts/format.sh +++ b/scripts/format.sh @@ -19,18 +19,18 @@ elif [[ ${OS} = "Darwin" ]] ; then fi # Discover clang-format -if type clang-format-15 2> /dev/null ; then - CLANG_FORMAT=clang-format-15 +if type clang-format-19 2> /dev/null ; then + CLANG_FORMAT=clang-format-19 elif type clang-format 2> /dev/null ; then # Clang format found, but need to check version CLANG_FORMAT=clang-format V=$(clang-format --version) - if [[ $V != *15.0* ]] ; then - echo "clang-format is not 15.0 (returned ${V})" + if [[ $V != *19.1* ]] ; then + echo "clang-format is not 19.1 (returned ${V})" #exit 1 fi else - echo "No appropriate clang-format found (expected clang-format-15, or clang-format)" + echo "No appropriate clang-format found (expected clang-format-19, or clang-format)" exit 1 fi diff --git a/src/engine/api/json_factory.cpp b/src/engine/api/json_factory.cpp index e362e584beb..e5bd9ee87b6 100644 --- a/src/engine/api/json_factory.cpp +++ b/src/engine/api/json_factory.cpp @@ -289,12 +289,12 @@ util::json::Array makeRouteLegs(std::vector legs, auto leg = std::move(legs[idx]); util::json::Array json_steps; json_steps.values.reserve(leg.steps.size()); - std::transform(std::make_move_iterator(leg.steps.begin()), - std::make_move_iterator(leg.steps.end()), - std::back_inserter(json_steps.values), - [&step_geometry_iter](guidance::RouteStep step) { - return makeRouteStep(std::move(step), std::move(*step_geometry_iter++)); - }); + std::transform( + std::make_move_iterator(leg.steps.begin()), + std::make_move_iterator(leg.steps.end()), + std::back_inserter(json_steps.values), + [&step_geometry_iter](guidance::RouteStep step) + { return makeRouteStep(std::move(step), std::move(*step_geometry_iter++)); }); if (annotations.size() > 0) { json_legs.values.push_back( diff --git a/src/engine/plugins/viaroute.cpp b/src/engine/plugins/viaroute.cpp index a59a2c467e0..7e0adbd3501 100644 --- a/src/engine/plugins/viaroute.cpp +++ b/src/engine/plugins/viaroute.cpp @@ -159,20 +159,20 @@ Status ViaRoutePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithm const auto all_in_same_component = [](const std::vector &waypoint_candidates) { - return std::any_of(waypoint_candidates.front().begin(), - waypoint_candidates.front().end(), - // For each of the first possible phantoms, check if all other - // positions in the list have a phantom from the same component. - [&](const PhantomNode &phantom) - { - const auto component_id = phantom.component.id; - return std::all_of( - std::next(waypoint_candidates.begin()), - std::end(waypoint_candidates), - [component_id](const PhantomNodeCandidates &candidates) { - return candidatesHaveComponent(candidates, component_id); - }); - }); + return std::any_of( + waypoint_candidates.front().begin(), + waypoint_candidates.front().end(), + // For each of the first possible phantoms, check if all other + // positions in the list have a phantom from the same component. + [&](const PhantomNode &phantom) + { + const auto component_id = phantom.component.id; + return std::all_of( + std::next(waypoint_candidates.begin()), + std::end(waypoint_candidates), + [component_id](const PhantomNodeCandidates &candidates) + { return candidatesHaveComponent(candidates, component_id); }); + }); }; if (!all_in_same_component(snapped_phantoms)) diff --git a/src/extractor/edge_based_graph_factory.cpp b/src/extractor/edge_based_graph_factory.cpp index 2a447a2741f..3574b0d7da2 100644 --- a/src/extractor/edge_based_graph_factory.cpp +++ b/src/extractor/edge_based_graph_factory.cpp @@ -1197,9 +1197,8 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedEdges( first_turn_edges.first, first_turn_edges.second, std::back_inserter(node_sequences), - [](const auto turn_edges) { - return std::vector{turn_edges.second.first, turn_edges.second.second}; - }); + [](const auto turn_edges) + { return std::vector{turn_edges.second.first, turn_edges.second.second}; }); std::for_each(std::next(turns.begin()), turns.end(), diff --git a/src/guidance/turn_handler.cpp b/src/guidance/turn_handler.cpp index 5672f62c7b5..72abb58cdec 100644 --- a/src/guidance/turn_handler.cpp +++ b/src/guidance/turn_handler.cpp @@ -223,12 +223,11 @@ bool TurnHandler::isObviousOfTwo(const EdgeID via_edge, bool TurnHandler::hasObvious(const EdgeID &via_edge, const Fork &fork) const { - auto obvious_road = std::adjacent_find(fork.begin, - fork.end, - [&, this](const auto &a, const auto &b) { - return this->isObviousOfTwo(via_edge, a, b) || - this->isObviousOfTwo(via_edge, b, a); - }); + auto obvious_road = std::adjacent_find( + fork.begin, + fork.end, + [&, this](const auto &a, const auto &b) + { return this->isObviousOfTwo(via_edge, a, b) || this->isObviousOfTwo(via_edge, b, a); }); // return whether an obvious road was found return obvious_road != fork.end; } diff --git a/src/partitioner/dinic_max_flow.cpp b/src/partitioner/dinic_max_flow.cpp index 974478f999c..32a1edeb9d8 100644 --- a/src/partitioner/dinic_max_flow.cpp +++ b/src/partitioner/dinic_max_flow.cpp @@ -69,11 +69,11 @@ DinicMaxFlow::MinCut DinicMaxFlow::operator()(const BisectionGraphView &view, auto levels = ComputeLevelGraph(view, border_source_nodes, source_nodes, sink_nodes, flow); // check if the sink can be reached from the source, it's enough to check the border - const auto separated = std::find_if(border_sink_nodes.begin(), - border_sink_nodes.end(), - [&levels](const auto node) { - return levels[node] != INVALID_LEVEL; - }) == border_sink_nodes.end(); + const auto separated = + std::find_if(border_sink_nodes.begin(), + border_sink_nodes.end(), + [&levels](const auto node) + { return levels[node] != INVALID_LEVEL; }) == border_sink_nodes.end(); if (!separated) { @@ -297,11 +297,11 @@ bool DinicMaxFlow::Validate(const BisectionGraphView &view, const SourceSinkNodes &sink_nodes) const { // sink and source cannot share a common node - const auto separated = std::find_if(source_nodes.begin(), - source_nodes.end(), - [&sink_nodes](const auto node) { - return sink_nodes.contains(node); - }) == source_nodes.end(); + const auto separated = + std::find_if(source_nodes.begin(), + source_nodes.end(), + [&sink_nodes](const auto node) + { return sink_nodes.contains(node); }) == source_nodes.end(); const auto invalid_id = [&view](const NodeID nid) { return nid >= view.NumberOfNodes(); }; const auto in_range_source = diff --git a/src/partitioner/recursive_bisection.cpp b/src/partitioner/recursive_bisection.cpp index 5de66b263a8..43359801418 100644 --- a/src/partitioner/recursive_bisection.cpp +++ b/src/partitioner/recursive_bisection.cpp @@ -60,9 +60,8 @@ RecursiveBisection::RecursiveBisection(BisectionGraph &bisection_graph_, std::transform(first, last, std::back_inserter(forest), - [this](auto graph) { - return TreeNode{std::move(graph), internal_state.SCCDepth()}; - }); + [this](auto graph) + { return TreeNode{std::move(graph), internal_state.SCCDepth()}; }); using Feeder = tbb::feeder; diff --git a/src/util/guidance/bearing_class.cpp b/src/util/guidance/bearing_class.cpp index f2e6714a6f8..61a3a90886e 100644 --- a/src/util/guidance/bearing_class.cpp +++ b/src/util/guidance/bearing_class.cpp @@ -65,7 +65,8 @@ std::size_t BearingClass::findMatchingBearing(const double bearing) const auto max_element = std::max_element(available_bearings.begin(), available_bearings.end(), - [&](const DiscreteBearing first, const DiscreteBearing second) { + [&](const DiscreteBearing first, const DiscreteBearing second) + { return angularDeviation(first, discrete_bearing) > angularDeviation(second, discrete_bearing); }); diff --git a/unit_tests/extractor/restriction_graph.cpp b/unit_tests/extractor/restriction_graph.cpp index b5c24694f14..e66e6142308 100644 --- a/unit_tests/extractor/restriction_graph.cpp +++ b/unit_tests/extractor/restriction_graph.cpp @@ -48,12 +48,12 @@ void checkInstructions(RestrictionGraph::RestrictionRange restrictions, std::vector expected_instructions) { std::vector actual_instructions; - std::transform(restrictions.begin(), - restrictions.end(), - std::back_inserter(actual_instructions), - [](const auto &restriction) { - return instruction{restriction->turn_path.To(), bool(restriction->is_only)}; - }); + std::transform( + restrictions.begin(), + restrictions.end(), + std::back_inserter(actual_instructions), + [](const auto &restriction) + { return instruction{restriction->turn_path.To(), bool(restriction->is_only)}; }); std::sort(actual_instructions.begin(), actual_instructions.end(), [](const auto &lhs, const auto &rhs)