From 30ff2c93490cff31c992d920a636edb908944f9f Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Tue, 30 Sep 2025 11:07:31 -0500 Subject: [PATCH 1/7] Fix rust CI checks --- .github/workflows/rust-tests.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/rust-tests.yml b/.github/workflows/rust-tests.yml index cce3d952a..3b697c893 100644 --- a/.github/workflows/rust-tests.yml +++ b/.github/workflows/rust-tests.yml @@ -16,6 +16,9 @@ jobs: with: submodules: recursive - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f + with: + toolchain: 1.90.0 + components: clippy, rustfmt - uses: taiki-e/install-action@a092537a3547af99875d9fdf67ec85c08738a2f9 # biome-a092537 - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0 with: @@ -49,7 +52,9 @@ jobs: - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f with: + toolchain: 1.90.0 target: ${{ matrix.target }} + components: clippy, rustfmt - uses: taiki-e/setup-cross-toolchain-action@5084abba9e77b5db42d44a1420a56e7c1c7c8433 # v1.31.1 with: @@ -75,6 +80,9 @@ jobs: with: submodules: recursive - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f + with: + toolchain: 1.90.0 + components: clippy - run: cargo clippy --workspace --all-targets --all-features env: RUSTFLAGS: -Dwarnings @@ -87,5 +95,6 @@ jobs: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f with: + toolchain: 1.90.0 components: rustfmt - run: cargo fmt --all --check From d9b6da863e14b9fedb0df397e095e3fcf6a45bb1 Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Tue, 30 Sep 2025 11:14:03 -0500 Subject: [PATCH 2/7] Install rustfmt for clippy check --- .github/workflows/rust-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust-tests.yml b/.github/workflows/rust-tests.yml index 3b697c893..0980590e1 100644 --- a/.github/workflows/rust-tests.yml +++ b/.github/workflows/rust-tests.yml @@ -82,7 +82,7 @@ jobs: - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f with: toolchain: 1.90.0 - components: clippy + components: clippy, rustfmt - run: cargo clippy --workspace --all-targets --all-features env: RUSTFLAGS: -Dwarnings From 506e8b0a43ebca914e7d09a88160574a266d55ce Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Tue, 30 Sep 2025 11:17:38 -0500 Subject: [PATCH 3/7] Update rust-toolchain action --- .github/workflows/rust-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust-tests.yml b/.github/workflows/rust-tests.yml index 0980590e1..2cf9cbe4b 100644 --- a/.github/workflows/rust-tests.yml +++ b/.github/workflows/rust-tests.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: submodules: recursive - - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f + - uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # 1.0-6d653ac with: toolchain: 1.90.0 components: clippy, rustfmt @@ -50,7 +50,7 @@ jobs: with: submodules: recursive - - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f + - uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # 1.0-6d653ac with: toolchain: 1.90.0 target: ${{ matrix.target }} @@ -79,7 +79,7 @@ jobs: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: submodules: recursive - - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f + - uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # 1.0-6d653ac with: toolchain: 1.90.0 components: clippy, rustfmt @@ -93,7 +93,7 @@ jobs: timeout-minutes: 30 steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f + - uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # 1.0-6d653ac with: toolchain: 1.90.0 components: rustfmt From 99787a2ae118247cdf3841d0b1263ba692f53ac9 Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Tue, 30 Sep 2025 11:30:14 -0500 Subject: [PATCH 4/7] Add components to rust-toolchain file --- bindings/rust/rust-toolchain | 1 + 1 file changed, 1 insertion(+) diff --git a/bindings/rust/rust-toolchain b/bindings/rust/rust-toolchain index 292fe499e..73cb934de 100644 --- a/bindings/rust/rust-toolchain +++ b/bindings/rust/rust-toolchain @@ -1,2 +1,3 @@ [toolchain] channel = "stable" +components = ["rustfmt", "clippy"] From 75956d2a1f284aa5255db15607ec52973c82aff3 Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Tue, 30 Sep 2025 11:35:12 -0500 Subject: [PATCH 5/7] Remove action configuration --- .github/workflows/rust-tests.yml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/.github/workflows/rust-tests.yml b/.github/workflows/rust-tests.yml index 2cf9cbe4b..07206353b 100644 --- a/.github/workflows/rust-tests.yml +++ b/.github/workflows/rust-tests.yml @@ -15,10 +15,7 @@ jobs: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: submodules: recursive - - uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # 1.0-6d653ac - with: - toolchain: 1.90.0 - components: clippy, rustfmt + - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f - uses: taiki-e/install-action@a092537a3547af99875d9fdf67ec85c08738a2f9 # biome-a092537 - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0 with: @@ -50,11 +47,9 @@ jobs: with: submodules: recursive - - uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # 1.0-6d653ac + - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f with: - toolchain: 1.90.0 target: ${{ matrix.target }} - components: clippy, rustfmt - uses: taiki-e/setup-cross-toolchain-action@5084abba9e77b5db42d44a1420a56e7c1c7c8433 # v1.31.1 with: @@ -79,10 +74,7 @@ jobs: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: submodules: recursive - - uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # 1.0-6d653ac - with: - toolchain: 1.90.0 - components: clippy, rustfmt + - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f - run: cargo clippy --workspace --all-targets --all-features env: RUSTFLAGS: -Dwarnings @@ -93,8 +85,5 @@ jobs: timeout-minutes: 30 steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # 1.0-6d653ac - with: - toolchain: 1.90.0 - components: rustfmt + - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f - run: cargo fmt --all --check From a3ad22ceda913657de1fc52ca49cdd078d4ccb03 Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Tue, 30 Sep 2025 11:36:56 -0500 Subject: [PATCH 6/7] Revert "Remove action configuration" This reverts commit 75956d2a1f284aa5255db15607ec52973c82aff3. --- .github/workflows/rust-tests.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust-tests.yml b/.github/workflows/rust-tests.yml index 07206353b..2cf9cbe4b 100644 --- a/.github/workflows/rust-tests.yml +++ b/.github/workflows/rust-tests.yml @@ -15,7 +15,10 @@ jobs: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: submodules: recursive - - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f + - uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # 1.0-6d653ac + with: + toolchain: 1.90.0 + components: clippy, rustfmt - uses: taiki-e/install-action@a092537a3547af99875d9fdf67ec85c08738a2f9 # biome-a092537 - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0 with: @@ -47,9 +50,11 @@ jobs: with: submodules: recursive - - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f + - uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # 1.0-6d653ac with: + toolchain: 1.90.0 target: ${{ matrix.target }} + components: clippy, rustfmt - uses: taiki-e/setup-cross-toolchain-action@5084abba9e77b5db42d44a1420a56e7c1c7c8433 # v1.31.1 with: @@ -74,7 +79,10 @@ jobs: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: submodules: recursive - - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f + - uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # 1.0-6d653ac + with: + toolchain: 1.90.0 + components: clippy, rustfmt - run: cargo clippy --workspace --all-targets --all-features env: RUSTFLAGS: -Dwarnings @@ -85,5 +93,8 @@ jobs: timeout-minutes: 30 steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - uses: dtolnay/rust-toolchain@fcf085fcb4b4b8f63f96906cd713eb52181b5ea4 # 1.0-fcf085f + - uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # 1.0-6d653ac + with: + toolchain: 1.90.0 + components: rustfmt - run: cargo fmt --all --check From f7ab48f32c257bf819dca15b89a9077c028446e2 Mon Sep 17 00:00:00 2001 From: Justin Traglia Date: Tue, 30 Sep 2025 11:37:39 -0500 Subject: [PATCH 7/7] Use stable --- .github/workflows/rust-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust-tests.yml b/.github/workflows/rust-tests.yml index 2cf9cbe4b..67aaee320 100644 --- a/.github/workflows/rust-tests.yml +++ b/.github/workflows/rust-tests.yml @@ -17,7 +17,7 @@ jobs: submodules: recursive - uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # 1.0-6d653ac with: - toolchain: 1.90.0 + toolchain: stable components: clippy, rustfmt - uses: taiki-e/install-action@a092537a3547af99875d9fdf67ec85c08738a2f9 # biome-a092537 - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0 @@ -52,7 +52,7 @@ jobs: - uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # 1.0-6d653ac with: - toolchain: 1.90.0 + toolchain: stable target: ${{ matrix.target }} components: clippy, rustfmt @@ -81,7 +81,7 @@ jobs: submodules: recursive - uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # 1.0-6d653ac with: - toolchain: 1.90.0 + toolchain: stable components: clippy, rustfmt - run: cargo clippy --workspace --all-targets --all-features env: @@ -95,6 +95,6 @@ jobs: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # 1.0-6d653ac with: - toolchain: 1.90.0 + toolchain: stable components: rustfmt - run: cargo fmt --all --check