Skip to content

Commit 3a7fd6c

Browse files
committed
Update std and compiler
1 parent 80cc500 commit 3a7fd6c

File tree

7 files changed

+8
-4
lines changed

7 files changed

+8
-4
lines changed

Diff for: compiler/rustc_errors/src/diagnostic_impls.rs

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ macro_rules! into_diag_arg_for_number {
6464
impl IntoDiagArg for $ty {
6565
fn into_diag_arg(self) -> DiagArgValue {
6666
// Convert to a string if it won't fit into `Number`.
67+
#[allow(irrefutable_let_patterns)]
6768
if let Ok(n) = TryInto::<i32>::try_into(self) {
6869
DiagArgValue::Number(n)
6970
} else {

Diff for: compiler/rustc_middle/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
2525
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
2626
#![doc(rust_logo)]
27-
#![feature(min_exhaustive_patterns)]
27+
#![cfg_attr(bootstrap, feature(min_exhaustive_patterns))]
2828
#![feature(rustdoc_internals)]
2929
#![feature(allocator_api)]
3030
#![feature(array_windows)]

Diff for: compiler/rustc_target/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
1010
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
1111
#![doc(rust_logo)]
12-
#![feature(min_exhaustive_patterns)]
12+
#![cfg_attr(bootstrap, feature(min_exhaustive_patterns))]
1313
#![feature(rustdoc_internals)]
1414
#![feature(assert_matches)]
1515
#![feature(iter_intersperse)]

Diff for: compiler/rustc_transmute/src/layout/nfa.rs

+1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ where
8686
pub(crate) fn from_tree(tree: Tree<!, R>) -> Result<Self, Uninhabited> {
8787
Ok(match tree {
8888
Tree::Byte(b) => Self::from_byte(b),
89+
#[cfg(bootstrap)]
8990
Tree::Def(..) => unreachable!(),
9091
Tree::Ref(r) => Self::from_ref(r),
9192
Tree::Alt(alts) => {

Diff for: compiler/rustc_type_ir/src/fold.rs

+2
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ pub trait TypeFoldable<I: Interner>: TypeVisitable<I> {
8787
fn fold_with<F: TypeFolder<I>>(self, folder: &mut F) -> Self {
8888
match self.try_fold_with(folder) {
8989
Ok(t) => t,
90+
#[cfg(bootstrap)]
9091
Err(e) => match e {},
9192
}
9293
}
@@ -111,6 +112,7 @@ pub trait TypeSuperFoldable<I: Interner>: TypeFoldable<I> {
111112
fn super_fold_with<F: TypeFolder<I>>(self, folder: &mut F) -> Self {
112113
match self.try_super_fold_with(folder) {
113114
Ok(t) => t,
115+
#[cfg(bootstrap)]
114116
Err(e) => match e {},
115117
}
116118
}

Diff for: library/core/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204
//
205205
// Language features:
206206
// tidy-alphabetical-start
207+
#![cfg_attr(bootstrap, feature(min_exhaustive_patterns))]
207208
#![feature(abi_unadjusted)]
208209
#![feature(adt_const_params)]
209210
#![feature(allow_internal_unsafe)]
@@ -239,7 +240,6 @@
239240
#![feature(let_chains)]
240241
#![feature(link_llvm_intrinsics)]
241242
#![feature(macro_metavar_expr)]
242-
#![feature(min_exhaustive_patterns)]
243243
#![feature(min_specialization)]
244244
#![feature(multiple_supertrait_upcastable)]
245245
#![feature(must_not_suspend)]

Diff for: library/std/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@
270270
//
271271
// Language features:
272272
// tidy-alphabetical-start
273+
#![cfg_attr(bootstrap, feature(min_exhaustive_patterns))]
273274
#![feature(alloc_error_handler)]
274275
#![feature(allocator_internals)]
275276
#![feature(allow_internal_unsafe)]
@@ -294,7 +295,6 @@
294295
#![feature(let_chains)]
295296
#![feature(link_cfg)]
296297
#![feature(linkage)]
297-
#![feature(min_exhaustive_patterns)]
298298
#![feature(min_specialization)]
299299
#![feature(must_not_suspend)]
300300
#![feature(needs_panic_runtime)]

0 commit comments

Comments
 (0)