Rollup merge of #67041 - Wind-River:master_base, r=alexcrichton

RalfJung · web-flow · commit 1ae771bfa602 · 2019-12-05T09:30:42.000+01:00
add ExitStatusExt into prelude r? @alexcrichton
diff --git a/src/libstd/sys/vxworks/ext/mod.rs b/src/libstd/sys/vxworks/ext/mod.rs
@@ -18,4 +18,7 @@ pub mod prelude {
     #[doc(no_inline)]
     #[stable(feature = "rust1", since = "1.0.0")]
     pub use super::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+    #[doc(no_inline)]
+    #[stable(feature = "rust1", since = "1.0.0")]
+    pub use super::process::ExitStatusExt;
 }

Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,7 @@ pub mod prelude {`
`18`	`18`	`#[doc(no_inline)]`
`19`	`19`	`#[stable(feature = "rust1", since = "1.0.0")]`
`20`	`20`	`pub use super::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};`
	`21`	`+ #[doc(no_inline)]`
	`22`	`+ #[stable(feature = "rust1", since = "1.0.0")]`
	`23`	`+ pub use super::process::ExitStatusExt;`
`21`	`24`	`}`