Merge branch 'main' into custom_metal_layer_in_swift

.bazelversion

@@ -1 +1 @@
-7.3.1
+8.0.0

.github/workflows/linux-ci.yml

@@ -37,6 +37,7 @@ jobs:
       - name: Get all Linux files that have changed
         if: github.event_name != 'workflow_dispatch'
         id: changed-files
+
         uses: tj-actions/changed-files@v45
         with:
           files_yaml_from_source_file: .github/changed-files.yml
@@ -52,7 +53,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        renderer: [legacy, drawable, vulkan]
+        renderer: [legacy, drawable, vulkan, drawable-rust]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -91,6 +92,11 @@ jobs:
       - if: matrix.renderer == 'drawable'
         run: echo renderer_flag_cmake=-DMLN_DRAWABLE_RENDERER=ON >> "$GITHUB_ENV"
 
+      - if: matrix.renderer == 'drawable-rust'
+        run: |
+          echo "renderer_flag_cmake=-DMLN_DRAWABLE_RENDERER=ON -DMLN_USE_RUST=ON" >> "$GITHUB_ENV"
+          cargo install cxxbridge-cmd
+
       - if: matrix.renderer == 'legacy'
         run: echo renderer_flag_cmake=-DMLN_LEGACY_RENDERER=ON >> "$GITHUB_ENV"
 
@@ -158,7 +164,12 @@ jobs:
 
       - name: Run render test
         id: render_test
-        run: xvfb-run -a build/mbgl-render-test-runner --manifestPath=metrics/linux-${{ matrix.renderer }}.json
+        run: |
+          renderer="${{ matrix.renderer }}"
+          if [[ "$renderer" == *-rust ]]; then
+            renderer=${renderer%-rust}
+          fi
+          xvfb-run -a build/mbgl-render-test-runner --manifestPath=metrics/linux-"$renderer".json
 
       - name: Upload render test result
         if: always() && steps.render_test.outcome == 'failure'

.github/workflows/qt-ci.yml

@@ -60,64 +60,40 @@ jobs:
       matrix:
         include:
           - name: Linux
-            os: ubuntu-22.04
-            build_type: RelWithDebInfo
-            qt_version: 5.15.2
-            qt_target: desktop
-            compiler: ""
-          - name: Linux
-            os: ubuntu-22.04
+            os: ubuntu-24.04
             build_type: RelWithDebInfo
-            qt_version: 6.7.0
+            qt_version: 6.8.1
             qt_target: desktop
             compiler: ""
           - name: Linux_GCC13
             os: ubuntu-24.04
             build_type: RelWithDebInfo
-            qt_version: 6.7.0
+            qt_version: 6.8.1
             qt_target: desktop
             compiler: "gcc-13"
-          - name: macOS
-            os: macos-13
-            build_type: RelWithDebInfo
-            qt_version: 5.15.2
-            qt_target: desktop
-            deployment_target: 10.15
-            deployment_arch: "x86_64"
-            compiler: ""
           - name: macOS
             os: macos-14
             build_type: RelWithDebInfo
-            qt_version: 6.7.0
+            qt_version: 6.8.1
             qt_target: desktop
-            deployment_target: 11.0
+            deployment_target: 12.0
             deployment_arch: "x86_64;arm64"
             compiler: ""
-          - name: macOS_LLVM18
+          - name: macOS_LLVM
             os: macos-14
             build_type: RelWithDebInfo
-            qt_version: 6.7.0
+            qt_version: 6.8.1
             qt_target: desktop
-            deployment_target: 11.0
+            deployment_target: 12.0
             deployment_arch: "arm64"
             compiler: "llvm"
-          - name: win64_msvc2019
-            os: windows-2022
-            build_type: "RelWithDebInfo"
-            compiler_type: x64
-            compiler_version: 14.29
-            qt_version: 5.15.2
-            qt_target: desktop
-            qt_arch: win64_msvc2019_64
-            qt_tools: ""
-          - name: win64_msvc2019
+          - name: win64_msvc2022
             os: windows-2022
             build_type: "RelWithDebInfo"
             compiler_type: x64
-            compiler_version: 14.29
-            qt_version: 6.7.0
+            qt_version: 6.8.1
             qt_target: desktop
-            qt_arch: win64_msvc2019_64
+            qt_arch: win64_msvc2022_64
             qt_tools: ""
     runs-on: ${{ matrix.os }}
     env:
@@ -200,11 +176,10 @@ jobs:
           xcode-version: latest-stable
 
       - name: Setup MSVC
-        if: matrix.qt_arch == 'win64_msvc2019_64'
+        if: matrix.qt_arch == 'win64_msvc2022_64'
         uses: ilammy/msvc-dev-cmd@v1
         with:
           arch: ${{ matrix.compiler_type }}
-          toolset: ${{ matrix.compiler_version }}
 
       - name: Setup ninja
         uses: seanmiddleditch/gha-setup-ninja@v5
@@ -220,15 +195,6 @@ jobs:
           tools: ${{ matrix.qt_tools }}
           extra: --base https://mirrors.ocf.berkeley.edu/qt/
 
-      - name: Update ccache
-        if: runner.os == 'Windows'
-        shell: bash
-        run: |
-          # version is pinned due to issues with caching MSVC in 4.8
-          choco.exe install ccache --version=4.7.5 --no-progress
-          ccache.exe --version
-          echo "CCACHE_CONFIGPATH=C:/Users/runneradmin/AppData/Roaming/ccache/ccache.conf" >> "$GITHUB_ENV"
-
       - name: Set up ccache
         uses: hendrikmuhs/ccache-action@v1
         with:
@@ -249,16 +215,12 @@ jobs:
             -DMLN_WITH_QT=ON
           ninja
 
-      - name: Build maplibre-native (Linux, Qt5)
-        if: runner.os == 'Linux' && matrix.qt_version == '5.15.2'
-        uses: ./source/.github/actions/qt5-build
-
       - name: Build maplibre-native (Linux, Qt6)
-        if: runner.os == 'Linux' && matrix.qt_version != '5.15.2' && matrix.compiler == ''
+        if: runner.os == 'Linux' && matrix.compiler == ''
         uses: ./source/.github/actions/qt6-build
 
       - name: Build maplibre-native (Linux, Qt6, custom compiler)
-        if: runner.os == 'Linux' && matrix.qt_version != '5.15.2' && matrix.compiler != ''
+        if: runner.os == 'Linux' && matrix.compiler != ''
         run: |
           mkdir build && cd build
           qt-cmake ../source/ \
@@ -270,7 +232,7 @@ jobs:
           ninja
 
       - name: Build maplibre-native (Linux, Qt6, custom compiler, internal libraries)
-        if: runner.os == 'Linux' && matrix.qt_version != '5.15.2' && matrix.compiler != ''
+        if: runner.os == 'Linux' && matrix.compiler != ''
         run: |
           mkdir build-internal && cd build-internal
           qt-cmake ../source/ \
@@ -284,7 +246,7 @@ jobs:
           ninja
 
       - name: Run tests (Linux)
-        if: runner.os == 'Linux' && matrix.qt_version != '5.15.2' && matrix.compiler != ''
+        if: runner.os == 'Linux' && matrix.compiler != ''
         uses: coactions/setup-xvfb@v1
         with:
           run: ctest --output-on-failure

.github/workflows/windows-ci.yml

@@ -103,6 +103,7 @@ jobs:
           CMAKE_CXX_COMPILER_LAUNCHER: "${{ env.SCCACHE_PATH }}"
           RENDERER: "${{ matrix.renderer }}"
           RENDERING_MODE: "${{ matrix.rendering_mode }}"
+        timeout-minutes: 5
         run: |
           cmake --version
           & ${{ github.workspace }}\.github\scripts\windows-ci_configure_wrapper.ps1

.pre-commit-config.yaml

@@ -24,6 +24,13 @@ repos:
   hooks:
     - id: swiftformat
       args: [--swiftversion, "5.8"]
+-   repo: local
+    hooks:
+    -   id: rustfmt
+        name: rustfmt
+        entry: bash -c 'cd rustutils && cargo fmt' --
+        language: rust
+        types: [rust]
 ci:
   # sometimes fails https://github.com/keith/pre-commit-buildifier/issues/13
   skip: [buildifier]

BUILD.bazel

@@ -1,5 +1,5 @@
 load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_library", "js_run_binary")
-load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
+load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 load(
     "//bazel:core.bzl",
@@ -124,7 +124,6 @@ cc_library(
         ":mbgl-core-generated-private-artifacts",
         ":mbgl-core-generated-public-artifacts",
         "//vendor:boost",
-        "//vendor:csscolorparser",
         "//vendor:earcut.hpp",
         "//vendor:eternal",
         "//vendor:mapbox-base",
@@ -149,6 +148,13 @@ cc_library(
             "//vendor:metal-cpp",
         ],
         "//conditions:default": [],
+    }) + select({
+        ":rust": [
+            "//rustutils:rustutilslib",
+        ],
+        "//conditions:default": [
+            "//vendor:csscolorparser",
+        ],
     }),
 )
 
@@ -195,6 +201,19 @@ config_setting(
     },
 )
 
+bool_flag(
+    name = "use_rust",
+    build_setting_default = False,
+    visibility = ["//visibility:public"],
+)
+
+config_setting(
+    name = "rust",
+    flag_values = {
+        "//:use_rust": "true",
+    },
+)
+
 exports_files(
     [
         "LICENSE.md",

CMakeLists.txt

@@ -17,6 +17,7 @@ option(MLN_LEGACY_RENDERER "Include the legacy rendering pathway" ON)
 option(MLN_DRAWABLE_RENDERER "Include the drawable rendering pathway" OFF)
 option(MLN_USE_UNORDERED_DENSE "Use ankerl dense containers for performance" ON)
 option(MLN_USE_TRACY "Enable Tracy instrumentation" OFF)
+option(MLN_USE_RUST "Use components in Rust" OFF)
 
 if (MLN_WITH_CLANG_TIDY)
     find_program(CLANG_TIDY_COMMAND NAMES clang-tidy)
@@ -940,7 +941,7 @@ list(APPEND SRC_FILES
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/bounding_volumes.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/chrono.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/client_options.cpp
-    ${PROJECT_SOURCE_DIR}/src/mbgl/util/color.cpp
+    ${PROJECT_SOURCE_DIR}/src/mbgl/util/color$<IF:$<BOOL:${MLN_USE_RUST}>,.rs.cpp,.cpp>
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/constants.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/convert.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/util/event.cpp
@@ -1458,6 +1459,10 @@ include(${PROJECT_SOURCE_DIR}/vendor/vector-tile.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/wagyu.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/metal-cpp.cmake)
 
+if(MLN_USE_RUST)
+include(${PROJECT_SOURCE_DIR}/rustutils/rustutils.cmake)
+endif()
+
 target_link_libraries(
     mbgl-core
     PRIVATE
@@ -1468,7 +1473,6 @@ target_link_libraries(
         Mapbox::Base::cheap-ruler-cpp
         mbgl-compiler-options
         mbgl-vendor-boost
-        mbgl-vendor-csscolorparser
         mbgl-vendor-earcut.hpp
         mbgl-vendor-eternal
         mbgl-vendor-parsedate
@@ -1479,6 +1483,7 @@ target_link_libraries(
         mbgl-vendor-vector-tile
         mbgl-vendor-wagyu
         $<$<BOOL:${MLN_WITH_METAL}>:mbgl-vendor-metal-cpp>
+        $<IF:$<BOOL:${MLN_USE_RUST}>,mbgl-rustutils,mbgl-vendor-csscolorparser>
     PUBLIC
         Mapbox::Base
         Mapbox::Base::Extras::expected-lite
@@ -1490,9 +1495,8 @@ target_link_libraries(
         unordered_dense
 )
 
-export(TARGETS
+set(EXPORT_TARGETS
     mbgl-core
-
     mapbox-base
     mapbox-base-cheap-ruler-cpp
     mapbox-base-extras-expected-lite
@@ -1508,7 +1512,6 @@ export(TARGETS
     mapbox-base-variant
     mbgl-compiler-options
     mbgl-vendor-boost
-    mbgl-vendor-csscolorparser
     mbgl-vendor-earcut.hpp
     mbgl-vendor-eternal
     mbgl-vendor-parsedate
@@ -1520,10 +1523,16 @@ export(TARGETS
     mbgl-vendor-wagyu
     mbgl-vendor-metal-cpp
     unordered_dense
-
-    FILE MapboxCoreTargets.cmake
 )
 
+if(MLN_USE_RUST)
+    list(APPEND EXPORT_TARGETS mbgl-rustutils rustutils)
+else()
+    list(APPEND EXPORT_TARGETS mbgl-vendor-csscolorparser)
+endif()
+
+export(TARGETS ${EXPORT_TARGETS} FILE MapboxCoreTargets.cmake)
+
 if(MLN_WITH_VULKAN)
     include(${PROJECT_SOURCE_DIR}/vendor/vulkan.cmake)