mirror of
https://github.com/rust-lang/rust.git
synced 2025-04-28 02:57:37 +00:00
Rollup merge of #74546 - jethrogb:jb/duplicate-attribute-maybe_uninit_extra, r=kennytm
Fix duplicate maybe_uninit_extra attribute Introduced in #72414
This commit is contained in:
commit
b7357c4c90
@ -224,10 +224,7 @@
|
||||
all(target_vendor = "fortanix", target_env = "sgx"),
|
||||
feature(slice_index_methods, coerce_unsized, sgx_platform, ptr_wrapping_offset_from)
|
||||
)]
|
||||
#![cfg_attr(
|
||||
all(test, target_vendor = "fortanix", target_env = "sgx"),
|
||||
feature(fixed_size_array, maybe_uninit_extra)
|
||||
)]
|
||||
#![cfg_attr(all(test, target_vendor = "fortanix", target_env = "sgx"), feature(fixed_size_array))]
|
||||
// std is implemented with unstable features, many of which are internal
|
||||
// compiler details that will never be stable
|
||||
// NB: the following list is sorted to minimize merge conflicts.
|
||||
|
Loading…
Reference in New Issue
Block a user