about summary refs log tree commit diff
path: root/src/libstd/lib.rs
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2018-12-24 13:29:30 +0100
committerGitHub <noreply@github.com>2018-12-24 13:29:30 +0100
commit05f3b3cbcebb2957a7d134665aa25aa5cd73a15e (patch)
tree65f6796eede0529ac77f9ab8be4b17ee1a0d6865 /src/libstd/lib.rs
parentf1051b574c26e20608ff26415a3dddd13f140925 (diff)
parentdcb5db80b25b8e7fe2ce3a382b793673803cbc1a (diff)
downloadrust-05f3b3cbcebb2957a7d134665aa25aa5cd73a15e.tar.gz
rust-05f3b3cbcebb2957a7d134665aa25aa5cd73a15e.zip
Rollup merge of #56978 - jethrogb:jb/sgx-os-mod, r=joshtriplett
Add `std::os::fortanix_sgx` module

This PR adds the `std::os::sgx` module to expose platform-specific APIs behind the `sgx_platform` feature gate.

Depends on https://github.com/rust-lang/rust/pull/56972 to be able to meaningfully build `std::os` documentation for non-standard targets.

Tracking issue: https://github.com/rust-lang/rust/issues/56975
Diffstat (limited to 'src/libstd/lib.rs')
-rw-r--r--src/libstd/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 5bede9eafc1..4a693bffddf 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -314,7 +314,7 @@
 #![feature(alloc_layout_extra)]
 #![feature(maybe_uninit)]
 #![cfg_attr(target_env = "sgx", feature(global_asm, range_contains, slice_index_methods,
-                                        decl_macro, coerce_unsized))]
+                                        decl_macro, coerce_unsized, sgx_platform))]
 
 #![default_lib_allocator]