Merge branch 'main' into feat/qnx8

Author: AkhilTThomas

.github/workflows/ci.yaml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-24.04
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup Rust toolchain
         run: ./ci/install-rust.sh && rustup component add rustfmt
       - name: Check style
@@ -42,7 +42,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - run: rustup update stable --no-self-update
       - uses: Swatinem/rust-cache@v2
       # Here we use the latest stable Rust toolchain already installed by GitHub
@@ -65,7 +65,7 @@ jobs:
     env:
       TOOLCHAIN: ${{ matrix.toolchain }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup Rust toolchain
         run: ./ci/install-rust.sh
 
@@ -140,7 +140,7 @@ jobs:
     env:
       TARGET: ${{ matrix.target }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup Rust toolchain
         run: ./ci/install-rust.sh
       - uses: Swatinem/rust-cache@v2
@@ -249,7 +249,7 @@ jobs:
     env:
       TARGET: ${{ matrix.target }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup Rust toolchain
         run: ./ci/install-rust.sh
       - uses: Swatinem/rust-cache@v2
@@ -288,9 +288,9 @@ jobs:
           - x86_64-pc-solaris
     timeout-minutes: 25
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: test on Solaris
-        uses: vmactions/[email protected].4
+        uses: vmactions/[email protected].5
         with:
           release: "11.4-gcc"
           usesh: true

.github/workflows/release.yaml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Install Rust (rustup)

ctest-test/build.rs

@@ -42,6 +42,7 @@ fn test_ctest() {
         // public C typedefs have to manually be specified because they are identical to normal
         // structs on the Rust side.
         .rename_union_ty(|ty| (ty == "T2Union").then_some(ty.to_string()))
+        .alias_is_c_enum(|e| e == "enum_repr_too_small" || e == "enum_wrong_signedness")
         .skip_roundtrip(|_| true);
     ctest::generate_test(&mut t2gen, "src/t2.rs", "t2gen.rs").unwrap();
 }

ctest-test/src/t2.h

@@ -21,3 +21,11 @@ static void T2a(void) {}
 
 #define T2C 4
 #define T2S "a"
+
+enum enum_repr_too_small {
+    ENUM_REPR_TOO_SMALL_A
+};
+
+enum enum_wrong_signedness {
+    ENUM_WRONG_SIGNEDNESS_A
+};

ctest-test/src/t2.rs

@@ -1,3 +1,5 @@
+#![allow(non_camel_case_types)]
+
 use std::ffi::{c_char, c_int};
 
 pub type T2Foo = u32;
@@ -34,3 +36,15 @@ i! {
 extern "C" {
     pub fn T2a();
 }
+
+#[cfg(target_env = "msvc")]
+pub type enum_repr_too_small = i16;
+#[cfg(not(target_env = "msvc"))]
+pub type enum_repr_too_small = u16;
+pub const ENUM_REPR_TOO_SMALL_A: enum_repr_too_small = 0;
+
+#[cfg(target_env = "msvc")]
+pub type enum_wrong_signedness = u32;
+#[cfg(not(target_env = "msvc"))]
+pub type enum_wrong_signedness = i32;
+pub const ENUM_WRONG_SIGNEDNESS_A: enum_wrong_signedness = 0;

ctest-test/tests/all.rs

@@ -58,6 +58,9 @@ fn t2() {
         "bad T2Union size",
         "bad field type b of T2Union",
         "bad field offset b of T2Union",
+        "bad enum_wrong_signedness signed",
+        "bad enum_repr_too_small size",
+        "bad enum_repr_too_small align",
     ];
     let mut errors = errors.iter().cloned().collect::<HashSet<_>>();
 

ctest/Cargo.toml

@@ -5,12 +5,12 @@ edition = "2024"
 rust-version = "1.88"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/libc"
-publish = false
+publish = true
 
 [dependencies]
 askama = "0.14.0"
 cc = "1.2.29"
-proc-macro2 = { version = "1.0.95", features = ["span-locations"] }
+proc-macro2 = { version = "1.0.101", features = ["span-locations"] }
 quote = "1.0.40"
 syn = { version = "2.0.104", features = ["full", "visit", "extra-traits"] }
 thiserror = "2.0.12"

ctest/README.md

@@ -10,7 +10,7 @@ APIs in Rust match the APIs defined in C.
 
 ## MSRV (Minimum Supported Rust Version)
 
-The MSRV is 1.63.0 because of the transitive dependencies.
+The MSRV is 1.88.0 because of the transitive dependencies.
 Note that MSRV may be changed anytime by dependencies.
 
 ## Example
@@ -34,7 +34,7 @@ mylib-sys = { path = "../mylib-sys" }
 libc = "0.2"
 
 [build-dependencies]
-ctest = "0.4"
+ctest = "0.5.0-beta.0"
 ```
 
 Next, add a build script to `systest/build.rs`:
@@ -52,7 +52,7 @@ fn main() {
 
     // Generate the tests, passing the path to the `*-sys` library as well as
     // the module to generate.
-    cfg.generate("../mylib-sys/lib.rs", "all.rs");
+    ctest::generate_test(&mut cfg, "../mylib-sys/lib.rs", "all.rs");
 }
 ```
 
@@ -72,10 +72,10 @@ directory, and everything should be kicked into action!
 
 ## How it works
 
-This library will parse the `*-sys` crate to learn about all extern fn
-definitions within. It will then generate a test suite to ensure that all
-function function signatures, constant values, struct layout/alignment, type
-size/alignment, etc, all match their C equivalent.
+This library will parse the `*-sys` crate to learn about all definitions within.
+It will then generate a test suite to ensure that all function signatures,
+constant values, struct layout/alignment, type size/alignment, etc,
+all match their C equivalent.
 
 The generated tests come in two forms. One is a Rust file which contains the
 `main` function (hence the `include!` above), and another is a C file which is
@@ -101,6 +101,14 @@ This project is licensed under either of
 
 at your option.
 
+## Modifying test templates
+If you modify the test templates for either Rust or C in any way, then before
+contributing you must run the following command to update the pre-generated test
+files we check against:
+```rust
+$ LIBC_BLESS=1 cargo test
+```
+
 ## Contribution
 
 Unless you explicitly state otherwise, any contribution intentionally submitted

ctest/src/ast/constant.rs

@@ -6,8 +6,6 @@ pub struct Const {
     pub(crate) public: bool,
     pub(crate) ident: BoxStr,
     pub(crate) ty: syn::Type,
-    #[expect(unused)]
-    pub(crate) expr: syn::Expr,
 }
 
 impl Const {

ctest/src/ast/mod.rs

@@ -48,24 +48,3 @@ impl fmt::Display for Abi {
         }
     }
 }
-
-/// Things that can appear directly inside of a module or scope.
-///
-/// This is not an exhaustive list and only contains variants directly useful
-/// for our purposes.
-#[derive(Debug, Clone)]
-#[expect(unused)]
-pub(crate) enum Item {
-    /// Represents a constant defined in Rust.
-    Const(Const),
-    /// Represents a function defined in Rust.
-    Fn(Box<Fn>),
-    /// Represents a static variable defined in Rust.
-    Static(Static),
-    /// Represents a type alias defined in Rust.
-    Type(Type),
-    /// Represents a struct defined in Rust.
-    Struct(Struct),
-    /// Represents a union defined in Rust.
-    Union(Union),
-}