diff options
| author | bors <bors@rust-lang.org> | 2025-09-03 14:20:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-03 14:20:23 +0000 |
| commit | fd75a9c32d643f39c8c61df770d2cff60b3fefd5 (patch) | |
| tree | c37bb00bebb8e080cb67262f51620a3ee816220f /src/ci/docker | |
| parent | 51ff895062ba60a7cba53f57af928c3fb7b0f2f4 (diff) | |
| parent | 263048d06327d104e4e49d1288bc392c96c494fe (diff) | |
| download | rust-fd75a9c32d643f39c8c61df770d2cff60b3fefd5.tar.gz rust-fd75a9c32d643f39c8c61df770d2cff60b3fefd5.zip | |
Auto merge of #146160 - Zalathar:rollup-qxphx7g, r=Zalathar
Rollup of 8 pull requests Successful merges: - rust-lang/rust#145279 (Constify conversion traits (part 1)) - rust-lang/rust#145414 (unicode-table-generator refactors) - rust-lang/rust#145823 (editorconfig: don't use nonexistent syntax) - rust-lang/rust#145944 (std: Start supporting WASIp2 natively ) - rust-lang/rust#145961 (resolve: Avoid a regression from splitting prelude into two scopes) - rust-lang/rust#146032 (Explicity disable LSX feature for `loongarch64-unknown-none` target) - rust-lang/rust#146106 (fix(lexer): Only allow horizontal whitespace in frontmatter ) - rust-lang/rust#146154 (CI: rfl: move job forward to Linux v6.17-rc3 plus 2 commits) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/docker')
| -rwxr-xr-x | src/ci/docker/scripts/rfl-build.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ci/docker/scripts/rfl-build.sh b/src/ci/docker/scripts/rfl-build.sh index 70ff5d0d2c7..7e0fb5794f4 100755 --- a/src/ci/docker/scripts/rfl-build.sh +++ b/src/ci/docker/scripts/rfl-build.sh @@ -3,7 +3,8 @@ set -euo pipefail # https://github.com/rust-lang/rust/pull/144443 -LINUX_VERSION=7770d51bce622b13195b2d3c85407282fc9c27e5 +# https://github.com/rust-lang/rust/pull/145928 +LINUX_VERSION=8851e27d2cb947ea8bbbe8e812068f7bf5cbd00b # Build rustc, rustdoc, cargo, clippy-driver and rustfmt ../x.py build --stage 2 library rustdoc clippy rustfmt |