about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-06-05 18:29:39 +0000
committerbors <bors@rust-lang.org>2019-06-05 18:29:39 +0000
commit7cdaffd7962c4aae0cadd82baa241901b03f9458 (patch)
treef053afdeb0cc36faa2d4c419cbf370e467c6d854 /src/libstd
parent47f4975cd751a03c941431b35cd7a6cba6201730 (diff)
parent694b0486371752cd75270788f30e19a16601f88d (diff)
downloadrust-7cdaffd7962c4aae0cadd82baa241901b03f9458.tar.gz
rust-7cdaffd7962c4aae0cadd82baa241901b03f9458.zip
Auto merge of #61548 - Centril:rollup-5t6cvbk, r=Centril
Rollup of 5 pull requests

Successful merges:

 - #61503 (Fix cfg(test) build for x86_64-fortanix-unknown-sgx)
 - #61534 (Edit docs of ExitStatus)
 - #61536 (Don't allow using const fn arguments as "args_required_const")
 - #61538 (Don't use GNU noexec stack note)
 - #61546 (azure: Fix some minor issues which have broken our configuration )

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/lib.rs3
-rw-r--r--src/libstd/process.rs5
2 files changed, 6 insertions, 2 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
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index 6e4c6e4c366..a568f466637 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -1153,10 +1153,13 @@ impl From<fs::File> for Stdio {
 ///
 /// This `struct` is used to represent the exit status of a child process.
 /// Child processes are created via the [`Command`] struct and their exit
-/// status is exposed through the [`status`] method.
+/// status is exposed through the [`status`] method, or the [`wait`] method
+/// of a [`Child`] process.
 ///
 /// [`Command`]: struct.Command.html
+/// [`Child`]: struct.Child.html
 /// [`status`]: struct.Command.html#method.status
+/// [`wait`]: struct.Child.html#method.wait
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]
 #[stable(feature = "process", since = "1.0.0")]
 pub struct ExitStatus(imp::ExitStatus);