diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2020-07-20 12:30:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-20 12:30:27 -0700 |
| commit | b7357c4c9075008d21518baab8b2e6a1d3b3afa3 (patch) | |
| tree | 9c621f90a235ae685f1e37071c53849e9c41b0b6 | |
| parent | 15f8b80d952de86014ebad8dbcefdb86573320ec (diff) | |
| parent | c8cdcc8e517ab5831328ba71f57f00d177913174 (diff) | |
| download | rust-b7357c4c9075008d21518baab8b2e6a1d3b3afa3.tar.gz | |
Rollup merge of #74546 - jethrogb:jb/duplicate-attribute-maybe_uninit_extra, r=kennytm
Fix duplicate maybe_uninit_extra attribute
Introduced in #72414
| -rw-r--r-- | src/libstd/lib.rs | 5 |
1 files changed, 1 insertions, 4 deletions
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. |