Merge branch 'main' into libc-non-exhaustive

Author: mbyx

.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
 
@@ -88,8 +88,8 @@ jobs:
           if [ "${{ matrix.toolchain }}" = "1.63.0" ]; then
               # Remove `-Dwarnings` at the MSRV since lints may be different
               export RUSTFLAGS=""
-              # Remove `ctest-next` which uses the 2024 edition
-              perl -i -ne 'print unless /"ctest-(next|test)",/ || /"libc-test",/' Cargo.toml
+              # Remove `ctest` which uses the 2024 edition
+              perl -i -ne 'print unless /"ctest(-test)?",/ || /"libc-test",/' Cargo.toml
           fi
 
           ./ci/verify-build.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/solaris-vm@v1.1.4
+        uses: vmactions/solaris-vm@v1.1.5
         with:
           release: "11.4-gcc"
           usesh: true
@@ -306,21 +306,22 @@ jobs:
             ./ci/run.sh ${{ matrix.target }}
 
   ctest_msrv:
-    name: Check MSRV
+    name: Check ctest MSRV
     runs-on: ubuntu-24.04
     timeout-minutes: 10
     env:
       RUSTFLAGS: # No need to check warnings on old MSRV, unset `-Dwarnings`
     steps:
     - uses: actions/checkout@master
     - run: |
-        msrv="$(cargo metadata --format-version 1 | jq -r --arg CRATE_NAME ctest  '.packages | map(select(.name == $CRATE_NAME)) | first | .rust_version')"
+        msrv="$(
+          cargo metadata --format-version 1 |
+          jq -r --arg CRATE_NAME ctest '.packages | map(select((.name == $CRATE_NAME) and (.id | startswith("path+file")))) | first | .rust_version'
+        )"
         echo "MSRV: $msrv"
         echo "MSRV=$msrv" >> "$GITHUB_ENV"
     - name: Install Rust
       run: rustup update "$MSRV" --no-self-update && rustup default "$MSRV"
-    - name: Remove edition 2024 crates
-      run: perl -i -ne 'print unless /"ctest-(next|test)",/ || /"libc-test",/' Cargo.toml
     - uses: Swatinem/rust-cache@v2
     - run: cargo build -p ctest
 

.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)

Cargo.lock

@@ -141,7 +141,6 @@ extra_traits = []
 [workspace]
 members = [
     "ctest",
-    "ctest-next",
     "ctest-test",
     "libc-test",
 ]