Merge branch 'master' into fn-ptr

Author: lucic71

.github/workflows/codeql.yml

@@ -30,7 +30,7 @@ jobs:
       if: matrix.language == 'rust'
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: 1.94.0
+        toolchain: 1.95.0
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v4

.github/workflows/format.yml

@@ -1,12 +1,17 @@
 name: Format Check
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches: [ "**" ]
 
 jobs:
   format:
     runs-on: ubuntu-latest
     permissions:
-      contents: read
+      contents: write
 
     steps:
       - name: Checkout code
@@ -20,8 +25,36 @@ jobs:
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.94.0
-          components: rustfmt
+          toolchain: 1.95.0
+          components: rustfmt, clippy
+
+      - name: Setup nightly Rust for rule-preprocessor clippy
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly
+          components: rustfmt, clippy, rustc-dev
+
+      - name: Apply C++ formatting fixes
+        run: find cpp2rust tests -name '*.cpp' -o -name '*.h' -o -name '*.c' | xargs clang-format -i
+
+      - name: Apply Rust lint fixes
+        run: |
+          cargo clippy --fix --allow-dirty --manifest-path rules/Cargo.toml --all-targets
+          cargo +nightly clippy --fix --allow-dirty --manifest-path rule-preprocessor/Cargo.toml --all-targets
+          cargo clippy --fix --allow-dirty --manifest-path libcc2rs/Cargo.toml --all-targets
+
+      - name: Apply Rust formatting fixes
+        run: |
+          cargo fmt --manifest-path rules/Cargo.toml
+          cargo fmt --manifest-path rule-preprocessor/Cargo.toml
+          cargo fmt --manifest-path libcc2rs/Cargo.toml
+          find tests -name '*.rs' -print0 | xargs -0 rustfmt
+
+      - name: Commit auto-fixes
+        if: github.ref != 'refs/heads/master'
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: "Automatically apply formatting and lint fixes"
 
       - name: Check C++ formatting
         run: find cpp2rust tests -name '*.cpp' -o -name '*.h' -o -name '*.c' | xargs clang-format --dry-run --Werror
@@ -31,3 +64,10 @@ jobs:
           cargo fmt --manifest-path rules/Cargo.toml -- --check
           cargo fmt --manifest-path rule-preprocessor/Cargo.toml -- --check
           cargo fmt --manifest-path libcc2rs/Cargo.toml -- --check
+          find tests -name '*.rs' -print0 | xargs -0 rustfmt --check
+
+      - name: Check Rust lints
+        run: |
+          cargo clippy --manifest-path rules/Cargo.toml --all-targets --all-features -- -Dwarnings
+          cargo +nightly clippy --manifest-path rule-preprocessor/Cargo.toml --all-targets --all-features -- -Dwarnings
+          cargo clippy --manifest-path libcc2rs/Cargo.toml --all-targets --all-features -- -Dwarnings

.github/workflows/run-tests.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.94.0
+          toolchain: 1.95.0
           components: rustfmt
 
       - name: Setup Python

CMakeLists.txt

@@ -63,7 +63,7 @@ if (NOT RUSTC_LLVM_VERSION STREQUAL LLVM_PACKAGE_VERSION)
   message(WARNING "The LLVM versions used by rustc and clang are different!")
 endif()
 
-set(RUST_STABLE_VERSION "1.94.0")
+set(RUST_STABLE_VERSION "1.95.0")
 
 function(write_rust_toolchain DIR)
   set(_content "[toolchain]\nchannel = \"${RUST_STABLE_VERSION}\"\n")

README.md

@@ -37,7 +37,7 @@ On Ubuntu, install the required dependencies with:
 
 ```bash
 sudo apt install libclang-22-dev clang++-22 ninja-build cmake python3-tomli
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.94.0
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.95.0
 ```
 
 

cpp2rust/converter/converter.cpp

@@ -48,10 +48,9 @@ use libc::*;
 extern crate libcc2rs;
 use libcc2rs::*;
 use std::collections::BTreeMap;
-use std::rc::Rc;
-use std::io::{Read, Write};
-use std::io::Seek;
+use std::io::{Read, Write, Seek};
 use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
+use std::rc::Rc;
 )");
 }
 

cpp2rust/converter/models/converter_refcount.cpp

@@ -23,13 +23,12 @@ void ConverterRefCount::EmitFilePreamble() {
   StrCat(R"(
 extern crate libcc2rs;
 use libcc2rs::*;
-use std::collections::BTreeMap;
 use std::cell::RefCell;
-use std::io::{Read, Write};
-use std::rc::{Rc, Weak};
-use std::io::Seek;
-use std::os::fd::AsFd;
+use std::collections::BTreeMap;
+use std::io::{Read, Write, Seek};
 use std::io::prelude::*;
+use std::os::fd::AsFd;
+use std::rc::{Rc, Weak};
 )");
 }
 

libcc2rs/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.94.0"
+channel = "1.95.0"

libcc2rs/src/compat.rs

@@ -13,6 +13,11 @@ extern "C" {
     fn platform_malloc_size(ptr: *const c_void) -> usize;
 }
 
+/// # Safety
+///
+/// The pointer `ptr` must be a pointer to a block of memory allocated by
+/// the appropriate allocator (e.g., `malloc`).
+// The memory must not have been deallocated.
 pub unsafe fn malloc_usable_size(ptr: *mut c_void) -> usize {
     #[cfg(target_os = "linux")]
     {

libcc2rs/src/dec.rs

@@ -66,6 +66,9 @@ prefix_wrap_dec_impl!(i8, u8, i16, u16, i32, u32, i64, u64, isize, usize);
 prefix_nowrap_dec_impl!(f32, f64);
 
 pub trait UnsafePostfixDec {
+    /// # Safety
+    /// This function decrements a pointer and returns the old value.
+    /// The caller must ensure the pointer is valid and doesn't underflow.
     unsafe fn postfix_dec(&mut self) -> Self;
 }
 
@@ -88,6 +91,9 @@ impl<T> UnsafePostfixDec for *mut T {
 }
 
 pub trait UnsafePrefixDec {
+    /// # Safety
+    /// This function decrements a pointer and returns the new value.
+    /// The caller must ensure the pointer is valid and doesn't underflow.
     unsafe fn prefix_dec(&mut self) -> Self;
 }