diff --git a/src/process/wait.rs b/src/process/wait.rs index 4d0e6e25d..bbc2c12e5 100644 --- a/src/process/wait.rs +++ b/src/process/wait.rs @@ -306,8 +306,8 @@ pub enum WaitId<'a> { /// [Linux]: https://man7.org/linux/man-pages/man2/waitpid.2.html #[cfg(not(target_os = "wasi"))] #[inline] -pub fn waitpid(pid: Option, waitopts: WaitOptions) -> io::Result> { - Ok(backend::process::syscalls::waitpid(pid, waitopts)?.map(|(_, status)| status)) +pub fn waitpid(pid: Option, waitopts: WaitOptions) -> io::Result> { + backend::process::syscalls::waitpid(pid, waitopts) } /// `waitpid(-pgid, waitopts)`—Wait for a process in a specific process group @@ -328,8 +328,8 @@ pub fn waitpid(pid: Option, waitopts: WaitOptions) -> io::Result io::Result> { - Ok(backend::process::syscalls::waitpgid(pgid, waitopts)?.map(|(_, status)| status)) +pub fn waitpgid(pgid: Pid, waitopts: WaitOptions) -> io::Result> { + backend::process::syscalls::waitpgid(pgid, waitopts) } /// `wait(waitopts)`—Wait for any of the children of calling process to diff --git a/tests/process/wait.rs b/tests/process/wait.rs index 8c07ddab5..5658faca5 100644 --- a/tests/process/wait.rs +++ b/tests/process/wait.rs @@ -18,7 +18,7 @@ fn test_waitpid_none() { .expect("failed to execute child"); unsafe { kill(child.id() as _, SIGSTOP) }; - let status = process::waitpid(None, process::WaitOptions::UNTRACED) + let (_, status) = process::waitpid(None, process::WaitOptions::UNTRACED) .expect("failed to wait") .unwrap(); assert!(status.stopped()); @@ -35,7 +35,7 @@ fn test_waitpid_some() { unsafe { kill(child.id() as _, SIGSTOP) }; let pid = process::Pid::from_child(&child); - let status = process::waitpid(Some(pid), process::WaitOptions::UNTRACED) + let (_, status) = process::waitpid(Some(pid), process::WaitOptions::UNTRACED) .expect("failed to wait") .unwrap(); assert!(status.stopped()); @@ -52,7 +52,7 @@ fn test_waitpgid() { unsafe { kill(child.id() as _, SIGSTOP) }; let pgid = process::getpgrp(); - let status = process::waitpgid(pgid, process::WaitOptions::UNTRACED) + let (_, status) = process::waitpgid(pgid, process::WaitOptions::UNTRACED) .expect("failed to wait") .unwrap(); assert!(status.stopped());