Merge branch 'master' into fn-ptr

Author: lucic71

.github/workflows/codeql.yml

@@ -0,0 +1,59 @@
+name: "CodeQL"
+
+on: [push, pull_request]
+
+jobs:
+  analyze:
+    name: Analyze ${{ matrix.language }}
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'actions', 'cpp', 'rust' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v6
+
+    - name: Setup LLVM
+      if: matrix.language == 'cpp'
+      uses: ZhongRuoyu/setup-llvm@v0
+      with:
+        llvm-version: 22
+
+    - name: Setup Rust
+      if: matrix.language == 'rust'
+      uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: 1.94.0
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v4
+      with:
+        languages: ${{ matrix.language }}
+        trap-caching: false
+        config: |
+          paths-ignore:
+            - 'tests/**'
+
+    - name: Build C++ code
+      if: matrix.language == 'cpp'
+      run: |
+        mkdir build && cd build
+        cmake -GNinja ..
+        ninja
+
+    - name: Build Rust code
+      if: matrix.language == 'rust'
+      run: cargo build --verbose
+      working-directory: libcc2rs
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v4
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/format.yml

@@ -5,6 +5,9 @@ on: [push, pull_request]
 jobs:
   format:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
@@ -14,13 +17,14 @@ jobs:
         with:
           llvm-version: 22
 
-      - name: Install Rust toolchain
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.94.0
-          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: 1.94.0
+          components: rustfmt
 
       - name: Check C++ formatting
-        run: find cpp2rust tests -name '*.cpp' -o -name '*.h' | xargs clang-format --dry-run --Werror
+        run: find cpp2rust tests -name '*.cpp' -o -name '*.h' -o -name '*.c' | xargs clang-format --dry-run --Werror
 
       - name: Check Rust formatting
         run: |

.github/workflows/run-tests.yml

@@ -1,4 +1,4 @@
-name: Run tests
+name: "Run tests"
 
 on: [push, pull_request]
 
@@ -11,30 +11,33 @@ jobs:
         build_type: [Debug, Release]
 
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.test.name }} (${{ matrix.os }}, ${{ matrix.build_type }})
+    name: Run Tests (${{ matrix.os }}, ${{ matrix.build_type }})
+
+    permissions:
+      contents: read
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
 
-      - name: Setup LLVM 22
+      - name: Setup LLVM
         uses: ZhongRuoyu/setup-llvm@v0
         with:
           llvm-version: 22
 
-      - name: Install dependencies (Linux)
-        if: runner.os == 'Linux'
-        run: sudo apt-get install -y python3-tomli
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: 1.94.0
+          components: rustfmt
 
-      - name: Install dependencies (macOS)
-        if: runner.os == 'macOS'
-        run: |
-          pip3 install tomli --break-system-packages
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.x'
 
-      - name: Install Rust toolchain
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.94.0
-          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+      - name: Install Python dependencies
+        run: pip install tomli
 
       - name: Configure
         run: |

CMakeLists.txt

@@ -34,7 +34,7 @@ list(APPEND CMAKE_MODULE_PATH "${CLANG_CMAKE_DIR}")
 include(AddLLVM)
 include(AddClang)
 
-if (NOT CMAKE_CXX_COMPILER MATCHES "clang")
+if (NOT CMAKE_CXX_COMPILER MATCHES "clang" AND NOT DEFINED ENV{CODEQL_EXTRACTOR_CPP_ROOT})
   set(CMAKE_CXX_COMPILER "${CLANG_CMAKE_DIR}/../../../bin/clang++")
 endif()
 
@@ -93,7 +93,7 @@ add_subdirectory(tests)
 find_program(CLANG_FORMAT NAMES clang-format-22 clang-format)
 
 file(GLOB_RECURSE ALL_CXX_SOURCES
-     cpp2rust/*.cpp cpp2rust/*.h tests/*.cpp)
+     cpp2rust/*.cpp cpp2rust/*.h tests/*.cpp tests/*.c)
 
 add_custom_target("format"
                   COMMAND ${CLANG_FORMAT} -i ${ALL_CXX_SOURCES}

cpp2rust/CMakeLists.txt

@@ -13,7 +13,8 @@ target_link_libraries(cpp2rust PRIVATE
 target_include_directories(cpp2rust PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_include_directories(cpp2rust PUBLIC SYSTEM ${CLANG_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS})
 target_compile_definitions(cpp2rust PUBLIC ${LLVM_DEFINITIONS})
-target_compile_definitions(cpp2rust PUBLIC "-DCLANG_EXECUTABLE=\"${CMAKE_CXX_COMPILER}\"")
+target_compile_definitions(cpp2rust PUBLIC "-DCLANG_C_COMPILER=\"${CMAKE_C_COMPILER}\"")
+target_compile_definitions(cpp2rust PUBLIC "-DCLANG_CXX_COMPILER=\"${CMAKE_CXX_COMPILER}\"")
 target_compile_definitions(cpp2rust PUBLIC "-DCLANG_RESOURCE_DIR=\"${LLVM_LIBRARY_DIR}/clang/${LLVM_VERSION_MAJOR}\"")
 target_compile_definitions(cpp2rust PUBLIC "-DCOMPAT_INCLUDE_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/compat\"")