Skip to content

Commit 8433b79

Browse files
committed
Auto merge of rust-lang#78458 - Dylan-DPC:rollup-tan044s, r=Dylan-DPC
Rollup of 10 pull requests Successful merges: - rust-lang#78152 (Separate unsized locals) - rust-lang#78297 (Suggest calling await on method call and field access) - rust-lang#78351 (Move "mutable thing in const" check from interning to validity) - rust-lang#78365 (check object safety of generic constants) - rust-lang#78379 (Tweak invalid `fn` header and body parsing) - rust-lang#78391 (Add const_fn in generics test) - rust-lang#78401 (resolve: private fields in tuple struct ctor diag) - rust-lang#78408 (Remove tokens from foreign items in `TokenStripper`) - rust-lang#78447 (Fix typo in comment) - rust-lang#78453 (Fix typo in comments) Failed merges: r? `@ghost`
2 parents 17ba0ff + 1d4138a commit 8433b79

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

alloc/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@
130130
#![feature(unicode_internals)]
131131
#![feature(unsafe_block_in_unsafe_fn)]
132132
#![feature(unsize)]
133-
#![feature(unsized_locals)]
133+
#![cfg_attr(not(bootstrap), feature(unsized_fn_params))]
134+
#![cfg_attr(bootstrap, feature(unsized_locals))]
134135
#![feature(allocator_internals)]
135136
#![feature(slice_partition_dedup)]
136137
#![feature(maybe_uninit_extra, maybe_uninit_slice, maybe_uninit_uninit_array)]

core/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@
132132
#![feature(transparent_unions)]
133133
#![feature(try_blocks)]
134134
#![feature(unboxed_closures)]
135-
#![feature(unsized_locals)]
135+
#![cfg_attr(not(bootstrap), feature(unsized_fn_params))]
136+
#![cfg_attr(bootstrap, feature(unsized_locals))]
136137
#![cfg_attr(bootstrap, feature(untagged_unions))]
137138
#![feature(unwind_attributes)]
138139
#![feature(variant_count)]

0 commit comments

Comments
 (0)