From: Jethro Beekman <jethro@fortanix.com>
Date: Mon, 20 Jul 2020 10:23:47 +0000 (+0200)
Subject: Fix duplicate maybe_uninit_extra attribute
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=c8cdcc8e517ab5831328ba71f57f00d177913174;p=rust.git

Fix duplicate maybe_uninit_extra attribute
---

diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 11b8f953be4..02de3fff29f 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -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.