diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 932352c0f0..819fa4f1dd 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -114,16 +114,6 @@ runs: if: ${{ inputs.os == 'macOS' || inputs.os == 'Android' }} uses: dtolnay/rust-toolchain@stable - # Avoid 'rustup toolchain install nightly'. When a newer nightly is published, it triggers an in-place toolchain - # update whose component swap renames files from /opt/rustup/toolchains/ to /opt/rustup/tmp/. And those land on - # different overlayfs mounts inside the runner container — producing "Invalid cross-device link (os error 18)". - # TODO: Remove once 'imports_granularity' rustfmt option is stable: - # https://rust-lang.github.io/rustfmt/?version=v1.9.0&search=group#imports_granularity - - name: 'Ensure rustfmt is available on the nightly toolchain' - if: ${{ inputs.type == 'lint' }} - shell: bash - run: rustup component add rustfmt --toolchain nightly - - name: 'Install wasm-tools' if: ${{ inputs.type == 'build' }} shell: bash diff --git a/Meta/Docker/ci/VERSION b/Meta/Docker/ci/VERSION index e33b4a0eaf..af98d61971 100644 --- a/Meta/Docker/ci/VERSION +++ b/Meta/Docker/ci/VERSION @@ -1 +1 @@ -2026.05.25 +2026.06.02 diff --git a/Meta/lint-ci.sh b/Meta/lint-ci.sh index dcaa923648..1b49fe00ec 100755 --- a/Meta/lint-ci.sh +++ b/Meta/lint-ci.sh @@ -48,10 +48,10 @@ else ((FAILURES+=1)) fi -if cargo +nightly fmt --check ; then - echo -e "[${GREEN}OK${NC}]: cargo +nightly fmt --check" +if cargo fmt --check ; then + echo -e "[${GREEN}OK${NC}]: cargo fmt --check" else - echo -e "[${BOLD_RED}FAIL${NC}]: cargo +nightly fmt --check" + echo -e "[${BOLD_RED}FAIL${NC}]: cargo fmt --check" ((FAILURES+=1)) fi diff --git a/rust-toolchain.toml b/rust-toolchain.toml index aaf9c5b65b..4f0430eac9 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,3 @@ [toolchain] -# TODO: Pin to a stable version once `imports_granularity` rustfmt option is stable. https://rust-lang.github.io/rustfmt/?version=v1.9.0&search=group#imports_granularity -channel = "nightly" +channel = "1.96.0" components = ["rustfmt", "clippy"] diff --git a/rustfmt.toml b/rustfmt.toml index b85ada292f..8e9d07dcae 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -3,4 +3,6 @@ hard_tabs = false tab_spaces = 4 edition = "2024" style_edition = "2024" -imports_granularity = "Item" + +# FIXME: Enable this setting once it lands in a stable version. +# imports_granularity = "Item"