diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-06-05 17:43:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-05 17:43:28 +0200 |
| commit | 713ebb462c695c3b23078830d5aa7135604f8f19 (patch) | |
| tree | 274cbfbfac9222ce5df454c8d351d955061dc7a6 /src/libstd | |
| parent | 2a1d6c83d3158861ee028b26c531e5e2c7c68140 (diff) | |
| parent | a3d5e34903fbd966d96017d52bb14e92fca874d0 (diff) | |
| download | rust-713ebb462c695c3b23078830d5aa7135604f8f19.tar.gz rust-713ebb462c695c3b23078830d5aa7135604f8f19.zip | |
Rollup merge of #61503 - jethrogb:jb/fix-sgx-test, r=alexcrichton
Fix cfg(test) build for x86_64-fortanix-unknown-sgx
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index e044b46e0d0..a3356e6be2c 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -223,7 +223,8 @@ #![cfg_attr(all(target_vendor = "fortanix", target_env = "sgx"), feature(global_asm, slice_index_methods, decl_macro, coerce_unsized, sgx_platform, ptr_wrapping_offset_from))] -#![cfg_attr(all(test, target_vendor = "fortanix", target_env = "sgx"), feature(fixed_size_array))] +#![cfg_attr(all(test, target_vendor = "fortanix", target_env = "sgx"), + feature(fixed_size_array, maybe_uninit_extra))] // std is implemented with unstable features, many of which are internal // compiler details that will never be stable |