about summary refs log tree commit diff
path: root/src/ci/docker/scripts
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2025-05-24 06:49:47 +0000
committerbors <bors@rust-lang.org>2025-05-24 06:49:47 +0000
commit5af801b687e6e8b860ae970e725c8b9a3820d0ce (patch)
treef88bd59c43a5e76feab818e35326e2aff68c9e3d /src/ci/docker/scripts
parent105354db48223b7bf799b05d4dd3a412aca7bd05 (diff)
parent6d716743211c1c7e28f32c48f586fbeb3068304f (diff)
downloadrust-5af801b687e6e8b860ae970e725c8b9a3820d0ce.tar.gz
rust-5af801b687e6e8b860ae970e725c8b9a3820d0ce.zip
Auto merge of #141415 - est31:let_chains_libcore, r=tgross35
Remove #![feature(let_chains)] from libcore

PR https://github.com/rust-lang/rust/pull/132833 has stabilized the let_chains feature. This PR removes the last occurrence from the library.

Split out of #140966 as it caused breakage. Now we have a patch to the linux tree that fixes the build, so we update the linux tree to it.

cc https://github.com/Rust-for-Linux/linux/issues/1163
cc https://github.com/rust-lang/rust/issues/140722
Diffstat (limited to 'src/ci/docker/scripts')
-rwxr-xr-xsrc/ci/docker/scripts/rfl-build.sh3
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 1d280948ebe..fa18f67583f 100755
--- a/src/ci/docker/scripts/rfl-build.sh
+++ b/src/ci/docker/scripts/rfl-build.sh
@@ -2,7 +2,8 @@
 
 set -euo pipefail
 
-LINUX_VERSION=v6.15-rc4
+# https://github.com/Rust-for-Linux/linux/issues/1163
+LINUX_VERSION=3ca02fc80cc4fdac63aaa6796642f1e07be591d6
 
 # Build rustc, rustdoc, cargo, clippy-driver and rustfmt
 ../x.py build --stage 2 library rustdoc clippy rustfmt