Skip to content

Commit

Permalink
Rollup merge of #74546 - jethrogb:jb/duplicate-attribute-maybe_uninit…
Browse files Browse the repository at this point in the history
…_extra, r=kennytm

Fix duplicate maybe_uninit_extra attribute

Introduced in #72414
  • Loading branch information
Manishearth authored Jul 20, 2020
2 parents 15f8b80 + c8cdcc8 commit b7357c4
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/libstd/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit b7357c4

Please sign in to comment.