From 21dadb71c33c8f900cbfbef6085ecca3db6b250c Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Mon, 23 Feb 2026 21:42:58 +0100 Subject: [PATCH] fix: update shellexpand to 3.1.2 and unpin nightly (#22506) Co-authored-by: Amp --- .github/workflows/book.yml | 2 -- .github/workflows/lint.yml | 13 ------------- Cargo.lock | 24 ++++++++++++------------ 3 files changed, 12 insertions(+), 27 deletions(-) diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml index a5f821f06b..c66be0ce35 100644 --- a/.github/workflows/book.yml +++ b/.github/workflows/book.yml @@ -35,8 +35,6 @@ jobs: - name: Install Rust nightly uses: dtolnay/rust-toolchain@nightly - with: - toolchain: nightly-2026-02-21 - uses: mozilla-actions/sccache-action@v0.0.9 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e81229c81d..864643e859 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -26,9 +26,6 @@ jobs: - uses: rui314/setup-mold@v1 - uses: dtolnay/rust-toolchain@clippy with: - # Pin nightly to avoid breakage from str::as_str() stabilization - # which breaks shellexpand 3.1.1 method resolution. - toolchain: nightly-2026-02-21 components: clippy - uses: mozilla-actions/sccache-action@v0.0.9 - uses: Swatinem/rust-cache@v2 @@ -52,9 +49,6 @@ jobs: - uses: rui314/setup-mold@v1 - uses: dtolnay/rust-toolchain@nightly with: - # Pin nightly to avoid breakage from str::as_str() stabilization - # which breaks shellexpand 3.1.1 method resolution. - toolchain: nightly-2026-02-21 components: clippy - uses: mozilla-actions/sccache-action@v0.0.9 - uses: Swatinem/rust-cache@v2 @@ -147,8 +141,6 @@ jobs: - uses: actions/checkout@v6 - uses: rui314/setup-mold@v1 - uses: dtolnay/rust-toolchain@nightly - with: - toolchain: nightly-2026-02-21 - uses: mozilla-actions/sccache-action@v0.0.9 - uses: Swatinem/rust-cache@v2 with: @@ -168,7 +160,6 @@ jobs: - uses: rui314/setup-mold@v1 - uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly-2026-02-21 components: rustfmt - uses: mozilla-actions/sccache-action@v0.0.9 - name: Run fmt @@ -182,8 +173,6 @@ jobs: - uses: actions/checkout@v6 - uses: rui314/setup-mold@v1 - uses: dtolnay/rust-toolchain@nightly - with: - toolchain: nightly-2026-02-21 - uses: mozilla-actions/sccache-action@v0.0.9 - uses: Swatinem/rust-cache@v2 with: @@ -199,8 +188,6 @@ jobs: - uses: actions/checkout@v6 - uses: rui314/setup-mold@v1 - uses: dtolnay/rust-toolchain@nightly - with: - toolchain: nightly-2026-02-21 - uses: mozilla-actions/sccache-action@v0.0.9 - uses: Swatinem/rust-cache@v2 with: diff --git a/Cargo.lock b/Cargo.lock index 6f38d67f17..d35c9f5a8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1037,7 +1037,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1048,7 +1048,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -2947,7 +2947,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de" dependencies = [ "data-encoding", - "syn 2.0.116", + "syn 1.0.109", ] [[package]] @@ -3129,7 +3129,7 @@ dependencies = [ "libc", "option-ext", "redox_users 0.5.2", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -3458,7 +3458,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -5158,7 +5158,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -6124,7 +6124,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -11079,7 +11079,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -11565,9 +11565,9 @@ dependencies = [ [[package]] name = "shellexpand" -version = "3.1.1" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb" +checksum = "32824fab5e16e6c4d86dc1ba84489390419a39f97699852b66480bb87d297ed8" dependencies = [ "dirs", ] @@ -11928,7 +11928,7 @@ dependencies = [ "getrandom 0.4.1", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -13215,7 +13215,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.48.0", ] [[package]]