Skip to content

Commit 1d4138a

Browse files
authored
Rollup merge of rust-lang#78152 - spastorino:separate-unsized-locals, r=oli-obk
Separate unsized locals Closes rust-lang#71694 Takes over again rust-lang#72029 and rust-lang#74971 cc @RalfJung @oli-obk @pnkfelix @eddyb as they've participated in previous reviews of this PR.
2 parents 85189df + f6c6435 commit 1d4138a

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)