Skip to content

Commit 5af801b

Browse files
committed
Auto merge of #141415 - est31:let_chains_libcore, r=tgross35
Remove #![feature(let_chains)] from libcore PR #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 Rust-for-Linux/linux#1163 cc #140722
2 parents 105354d + 6d71674 commit 5af801b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

library/core/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@
158158
#![feature(intra_doc_pointers)]
159159
#![feature(intrinsics)]
160160
#![feature(lang_items)]
161-
#![feature(let_chains)]
162161
#![feature(link_llvm_intrinsics)]
163162
#![feature(macro_metavar_expr)]
164163
#![feature(marker_trait_attr)]

src/ci/docker/scripts/rfl-build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
set -euo pipefail
44

5-
LINUX_VERSION=v6.15-rc4
5+
# https://github.com/Rust-for-Linux/linux/issues/1163
6+
LINUX_VERSION=3ca02fc80cc4fdac63aaa6796642f1e07be591d6
67

78
# Build rustc, rustdoc, cargo, clippy-driver and rustfmt
89
../x.py build --stage 2 library rustdoc clippy rustfmt

0 commit comments

Comments
 (0)