Simplify process stubs.

Author: reitermarkus

library/std/src/sys/unix/ext/mod.rs

@@ -33,6 +33,7 @@ pub mod ffi;
 pub mod fs;
 pub mod io;
 pub mod net;
+#[cfg(not(target_os = "freertos"))]
 pub mod process;
 pub mod raw;
 pub mod thread;
@@ -69,6 +70,7 @@ pub mod prelude {
     #[doc(no_inline)]
     #[stable(feature = "rust1", since = "1.0.0")]
     pub use super::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+    #[cfg(not(target_os = "freertos"))]
     #[doc(no_inline)]
     #[stable(feature = "rust1", since = "1.0.0")]
     pub use super::process::{CommandExt, ExitStatusExt};

library/std/src/sys/unix/mod.rs

@@ -69,7 +69,9 @@ pub use self::l4re::net;
 pub mod net_fd;
 pub mod os;
 pub mod path;
+#[cfg_attr(target_os = "freertos", path = "../unsupported/pipe.rs")]
 pub mod pipe;
+#[cfg_attr(target_os = "freertos", path = "../unsupported/process.rs")]
 pub mod process;
 pub mod rand;
 #[cfg_attr(target_os = "freertos", path = "../wasm/rwlock_atomics.rs")]
@@ -252,6 +254,7 @@ where
     }
 }
 
+#[cfg(not(target_os = "freertos"))]
 pub fn cvt_nz(error: libc::c_int) -> crate::io::Result<()> {
     if error == 0 { Ok(()) } else { Err(crate::io::Error::from_raw_os_error(error)) }
 }

library/std/src/sys/unix/pipe.rs

@@ -9,12 +9,6 @@ use crate::sys::cvt_r;
 
 pub struct AnonPipe(FileDesc);
 
-#[cfg(target_os = "freertos")]
-pub fn anon_pipe() -> io::Result<(AnonPipe, AnonPipe)> {
-    crate::sys::unsupported()
-}
-
-#[cfg(not(target_os = "freertos"))]
 pub fn anon_pipe() -> io::Result<(AnonPipe, AnonPipe)> {
     use crate::sys::cvt;
     let mut fds = [0; 2];

library/std/src/sys/unix/process/mod.rs

@@ -4,12 +4,9 @@ pub use crate::ffi::OsString as EnvKey;
 pub use crate::sys_common::process::CommandEnvs;
 
 mod process_common;
-#[cfg(not(any(target_os = "freertos", target_os = "fuchsia")))]
+#[cfg(not(target_os = "fuchsia"))]
 #[path = "process_unix.rs"]
 mod process_inner;
-#[cfg(target_os = "freertos")]
-#[path = "process_freertos.rs"]
-mod process_inner;
 #[cfg(target_os = "fuchsia")]
 #[path = "process_fuchsia.rs"]
 mod process_inner;

library/std/src/sys/unix/process/process_common.rs

@@ -20,7 +20,7 @@ use crate::sys::fs::OpenOptions;
 use libc::{c_char, c_int, gid_t, uid_t, EXIT_FAILURE, EXIT_SUCCESS};
 
 cfg_if::cfg_if! {
-    if #[cfg(any(target_os = "freertos", target_os = "fuchsia"))] {
+    if #[cfg(target_os = "fuchsia")] {
         // fuchsia doesn't have /dev/null
     } else if #[cfg(target_os = "redox")] {
         const DEV_NULL: &str = "null:\0";
@@ -123,7 +123,7 @@ pub enum ChildStdio {
 
     // On Fuchsia, null stdio is the default, so we simply don't specify
     // any actions at the time of spawning.
-    #[cfg(any(target_os = "freertos", target_os = "fuchsia"))]
+    #[cfg(target_os = "fuchsia")]
     Null,
 }
 
@@ -363,7 +363,7 @@ impl Stdio {
                 Ok((ChildStdio::Owned(theirs.into_fd()), Some(ours)))
             }
 
-            #[cfg(not(any(target_os = "freertos", target_os = "fuchsia")))]
+            #[cfg(not(target_os = "fuchsia"))]
             Stdio::Null => {
                 let mut opts = OpenOptions::new();
                 opts.read(readable);
@@ -373,7 +373,7 @@ impl Stdio {
                 Ok((ChildStdio::Owned(fd.into_fd()), None))
             }
 
-            #[cfg(any(target_os = "freertos", target_os = "fuchsia"))]
+            #[cfg(target_os = "fuchsia")]
             Stdio::Null => Ok((ChildStdio::Null, None)),
         }
     }
@@ -398,7 +398,7 @@ impl ChildStdio {
             ChildStdio::Explicit(fd) => Some(fd),
             ChildStdio::Owned(ref fd) => Some(fd.raw()),
 
-            #[cfg(any(target_os = "freertos", target_os = "fuchsia"))]
+            #[cfg(target_os = "fuchsia")]
             ChildStdio::Null => None,
         }
     }

library/std/src/sys/unix/process/process_freertos.rs

@@ -17,16 +17,6 @@ use libc::{c_int, gid_t, pid_t, uid_t};
 ////////////////////////////////////////////////////////////////////////////////
 
 impl Command {
-    #[cfg(target_os = "freertos")]
-    pub fn spawn(
-        &mut self,
-        default: Stdio,
-        needs_stdin: bool,
-    ) -> io::Result<(Process, StdioPipes)> {
-        crate::sys::unsupported()
-    }
-
-    #[cfg(not(target_os = "freertos"))]
     pub fn spawn(
         &mut self,
         default: Stdio,
@@ -174,16 +164,6 @@ impl Command {
     // allocation). Instead we just close it manually. This will never
     // have the drop glue anyway because this code never returns (the
     // child will either exec() or invoke libc::exit)
-    #[cfg(target_os = "freertos")]
-    unsafe fn do_exec(
-        &mut self,
-        stdio: ChildPipes,
-        maybe_envp: Option<&CStringArray>
-    ) -> Result<!, io::Error> {
-        crate::sys::unsupported()
-    }
-
-    #[cfg(not(target_os = "freertos"))]
     unsafe fn do_exec(
         &mut self,
         stdio: ChildPipes,