diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4978157b9..80f0a234d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ repos: - id: check-yaml args: [--allow-multiple-documents] - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v18.1.4 + rev: v18.1.5 hooks: - id: clang-format files: '.*\.(hpp|cpp|h)' @@ -20,7 +20,7 @@ repos: - id: actionlint additional_dependencies: [shellcheck-py] - repo: https://github.com/nicklockwood/SwiftFormat - rev: "0.53.8" + rev: "0.53.9" hooks: - id: swiftformat args: [--swiftversion, "5.8"] diff --git a/bin/offline.cpp b/bin/offline.cpp index f51b14e7b..eb1930d39 100644 --- a/bin/offline.cpp +++ b/bin/offline.cpp @@ -230,8 +230,8 @@ int main(int argc, char* argv[]) { std::cout << status.completedResourceCount << " / " << status.requiredResourceCount << " resources | " << status.completedTileCount << " / " << status.requiredTileCount << " tiles" << (status.requiredResourceCountIsPrecise ? " | " : " (indeterminate); ") - << status.completedResourceSize << " bytes downloaded" << " (" << bytesPerSecond << " bytes/sec)" - << std::endl; + << status.completedResourceSize << " bytes downloaded" + << " (" << bytesPerSecond << " bytes/sec)" << std::endl; if (status.complete()) { std::cout << "Finished Download" << std::endl; diff --git a/platform/default/src/mbgl/storage/main_resource_loader.cpp b/platform/default/src/mbgl/storage/main_resource_loader.cpp index 1285c5825..a5cbd0616 100644 --- a/platform/default/src/mbgl/storage/main_resource_loader.cpp +++ b/platform/default/src/mbgl/storage/main_resource_loader.cpp @@ -50,9 +50,11 @@ public: if (res.kind == Resource::Kind::Tile) { // onlineResponse.data will be null if data not modified MBGL_TIMING_FINISH(watch, - " Action: " << "Requesting," << " URL: " << res.url.c_str() << " Size: " - << (response.data != nullptr ? response.data->size() : 0) << "B," - << " Time") + " Action: " + << "Requesting," + << " URL: " << res.url.c_str() << " Size: " + << (response.data != nullptr ? response.data->size() : 0) << "B," + << " Time") } callback(response); }); diff --git a/render-test/runner.cpp b/render-test/runner.cpp index 330300c56..401687a04 100644 --- a/render-test/runner.cpp +++ b/render-test/runner.cpp @@ -78,8 +78,10 @@ std::string simpleDiff(const Value& result, const Value& expected) { } if (resultTokens[i] != expectedTokens[i]) { - diff << "" << "-" << expectedTokens[i] << "" << std::endl; - diff << "" << "+" << resultTokens[i] << "" << std::endl; + diff << "" + << "-" << expectedTokens[i] << "" << std::endl; + diff << "" + << "+" << resultTokens[i] << "" << std::endl; } else { diff << resultTokens[i] << std::endl; } diff --git a/src/mbgl/tile/geometry_tile_worker.cpp b/src/mbgl/tile/geometry_tile_worker.cpp index 5f23cffb9..ec1c444f5 100644 --- a/src/mbgl/tile/geometry_tile_worker.cpp +++ b/src/mbgl/tile/geometry_tile_worker.cpp @@ -441,9 +441,10 @@ void GeometryTileWorker::parse() { requestNewImages(imageDependencies); MBGL_TIMING_FINISH(watch, - " Action: " << "Parsing," << " SourceID: " << sourceID.c_str() - << " Canonical: " << static_cast(id.canonical.z) << "/" << id.canonical.x << "/" - << id.canonical.y << " Time"); + " Action: " + << "Parsing," + << " SourceID: " << sourceID.c_str() << " Canonical: " << static_cast(id.canonical.z) + << "/" << id.canonical.x << "/" << id.canonical.y << " Time"); finalizeLayout(); } @@ -494,9 +495,10 @@ void GeometryTileWorker::finalizeLayout() { firstLoad = false; MBGL_TIMING_FINISH(watch, - " Action: " << "SymbolLayout," << " SourceID: " << sourceID.c_str() - << " Canonical: " << static_cast(id.canonical.z) << "/" << id.canonical.x << "/" - << id.canonical.y << " Time"); + " Action: " + << "SymbolLayout," + << " SourceID: " << sourceID.c_str() << " Canonical: " << static_cast(id.canonical.z) + << "/" << id.canonical.x << "/" << id.canonical.y << " Time"); parent.invoke(&GeometryTile::onLayout, std::make_shared(