Skip to content

Commit c256de2

Browse files
committed
Update std and compiler
1 parent 99468bb commit c256de2

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
@@ -66,6 +66,7 @@ macro_rules! into_diag_arg_for_number {
6666
impl IntoDiagArg for $ty {
6767
fn into_diag_arg(self) -> DiagArgValue {
6868
// Convert to a string if it won't fit into `Number`.
69+
#[allow(irrefutable_let_patterns)]
6970
if let Ok(n) = TryInto::<i32>::try_into(self) {
7071
DiagArgValue::Number(n)
7172
} else {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#![allow(rustc::diagnostic_outside_of_impl)]
2929
#![allow(rustc::potential_query_instability)]
3030
#![allow(rustc::untranslatable_diagnostic)]
31+
#![cfg_attr(bootstrap, feature(min_exhaustive_patterns))]
3132
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
3233
#![doc(rust_logo)]
3334
#![feature(allocator_api)]
@@ -48,7 +49,6 @@
4849
#![feature(iter_from_coroutine)]
4950
#![feature(let_chains)]
5051
#![feature(macro_metavar_expr)]
51-
#![feature(min_exhaustive_patterns)]
5252
#![feature(min_specialization)]
5353
#![feature(negative_impls)]
5454
#![feature(never_type)]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
1010
// tidy-alphabetical-start
1111
#![allow(internal_features)]
12+
#![cfg_attr(bootstrap, feature(min_exhaustive_patterns))]
1213
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
1314
#![doc(rust_logo)]
1415
#![feature(assert_matches)]
1516
#![feature(iter_intersperse)]
1617
#![feature(let_chains)]
17-
#![feature(min_exhaustive_patterns)]
1818
#![feature(rustc_attrs)]
1919
#![feature(rustdoc_internals)]
2020
// tidy-alphabetical-end

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

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

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

+2
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ pub trait TypeFoldable<I: Interner>: TypeVisitable<I> {
9191
fn fold_with<F: TypeFolder<I>>(self, folder: &mut F) -> Self {
9292
match self.try_fold_with(folder) {
9393
Ok(t) => t,
94+
#[cfg(bootstrap)]
9495
Err(e) => match e {},
9596
}
9697
}
@@ -115,6 +116,7 @@ pub trait TypeSuperFoldable<I: Interner>: TypeFoldable<I> {
115116
fn super_fold_with<F: TypeFolder<I>>(self, folder: &mut F) -> Self {
116117
match self.try_super_fold_with(folder) {
117118
Ok(t) => t,
119+
#[cfg(bootstrap)]
118120
Err(e) => match e {},
119121
}
120122
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@
192192
//
193193
// Language features:
194194
// tidy-alphabetical-start
195+
#![cfg_attr(bootstrap, feature(min_exhaustive_patterns))]
195196
#![feature(abi_unadjusted)]
196197
#![feature(adt_const_params)]
197198
#![feature(allow_internal_unsafe)]
@@ -225,7 +226,6 @@
225226
#![feature(link_llvm_intrinsics)]
226227
#![feature(macro_metavar_expr)]
227228
#![feature(marker_trait_attr)]
228-
#![feature(min_exhaustive_patterns)]
229229
#![feature(min_specialization)]
230230
#![feature(multiple_supertrait_upcastable)]
231231
#![feature(must_not_suspend)]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@
272272
//
273273
// Language features:
274274
// tidy-alphabetical-start
275+
#![cfg_attr(bootstrap, feature(min_exhaustive_patterns))]
275276
#![feature(alloc_error_handler)]
276277
#![feature(allocator_internals)]
277278
#![feature(allow_internal_unsafe)]
@@ -299,7 +300,6 @@
299300
#![feature(link_cfg)]
300301
#![feature(linkage)]
301302
#![feature(macro_metavar_expr_concat)]
302-
#![feature(min_exhaustive_patterns)]
303303
#![feature(min_specialization)]
304304
#![feature(must_not_suspend)]
305305
#![feature(needs_panic_runtime)]

0 commit comments

Comments
 (0)