use the new fd apis in std

2 files changed, 43 insertions, 34 deletions

diff --git a/tests/behavior.rs b/tests/behavior.rs
index ee51cb4..8712643 100644
--- a/tests/behavior.rs
+++ b/tests/behavior.rs
@@ -63,26 +63,24 @@ async fn test_multiple_async() {
 #[test]
 fn test_multiple_configured() {
     use std::io::BufRead as _;
-    use std::os::unix::io::FromRawFd as _;
+    use std::os::fd::AsRawFd as _;
 
     let pty = pty_process::blocking::Pty::new().unwrap();
     let pts = pty.pts().unwrap();
     pty.resize(pty_process::Size::new(24, 80)).unwrap();
 
-    let (stderr_pipe_r, stderr_pipe_w) = nix::unistd::pipe().unwrap();
-    let mut stderr_pipe_r = std::io::BufReader::new(unsafe {
-        std::fs::File::from_raw_fd(stderr_pipe_r)
-    });
-    let (pre_exec_pipe_r, pre_exec_pipe_w) = nix::unistd::pipe().unwrap();
-    let mut pre_exec_pipe_r = std::io::BufReader::new(unsafe {
-        std::fs::File::from_raw_fd(pre_exec_pipe_r)
-    });
+    let (stderr_pipe_r, stderr_pipe_w) = pipe();
+    let mut stderr_pipe_r =
+        std::io::BufReader::new(std::fs::File::from(stderr_pipe_r));
+    let (pre_exec_pipe_r, pre_exec_pipe_w) = pipe();
+    let mut pre_exec_pipe_r =
+        std::io::BufReader::new(std::fs::File::from(pre_exec_pipe_r));
     let mut cmd = pty_process::blocking::Command::new("perl");
     cmd.arg("-Esay 'foo'; say STDERR 'foo-stderr'; open my $fh, '>&=3'; say $fh 'foo-3';")
-        .stderr(unsafe { std::process::Stdio::from_raw_fd(stderr_pipe_w) });
+        .stderr(std::process::Stdio::from(stderr_pipe_w));
     unsafe {
         cmd.pre_exec(move || {
-            nix::unistd::dup2(pre_exec_pipe_w, 3)?;
+            nix::unistd::dup2(pre_exec_pipe_w.as_raw_fd(), 3)?;
             nix::fcntl::fcntl(
                 3,
                 nix::fcntl::F_SETFD(nix::fcntl::FdFlag::empty()),
@@ -135,7 +133,7 @@ fn test_multiple_configured() {
 #[tokio::test]
 async fn test_multiple_configured_async() {
     use futures::stream::StreamExt as _;
-    use std::os::unix::io::FromRawFd as _;
+    use std::os::fd::{AsRawFd as _, FromRawFd as _, IntoRawFd as _};
     use tokio::io::AsyncBufReadExt as _;
 
     let mut pty = pty_process::Pty::new().unwrap();
@@ -143,13 +141,13 @@ async fn test_multiple_configured_async() {
     pty.resize(pty_process::Size::new(24, 80)).unwrap();
     let (pty_r, _) = pty.split();
 
-    let (stderr_pipe_r, stderr_pipe_w) = nix::unistd::pipe().unwrap();
+    let (stderr_pipe_r, stderr_pipe_w) = pipe();
     let mut stderr_pipe_r = tokio::io::BufReader::new(unsafe {
-        tokio::fs::File::from_raw_fd(stderr_pipe_r)
+        tokio::fs::File::from_raw_fd(stderr_pipe_r.into_raw_fd())
     });
-    let (pre_exec_pipe_r, pre_exec_pipe_w) = nix::unistd::pipe().unwrap();
+    let (pre_exec_pipe_r, pre_exec_pipe_w) = pipe();
     let mut pre_exec_pipe_r = tokio::io::BufReader::new(unsafe {
-        tokio::fs::File::from_raw_fd(pre_exec_pipe_r)
+        tokio::fs::File::from_raw_fd(pre_exec_pipe_r.into_raw_fd())
     });
     let mut cmd = pty_process::Command::new("perl");
     cmd.arg(
@@ -158,10 +156,10 @@ async fn test_multiple_configured_async() {
             open my $fh, '>&=3'; \
             say $fh 'foo-3';",
     )
-    .stderr(unsafe { std::process::Stdio::from_raw_fd(stderr_pipe_w) });
+    .stderr(std::process::Stdio::from(stderr_pipe_w));
     unsafe {
         cmd.pre_exec(move || {
-            nix::unistd::dup2(pre_exec_pipe_w, 3)?;
+            nix::unistd::dup2(pre_exec_pipe_w.as_raw_fd(), 3)?;
             nix::fcntl::fcntl(
                 3,
                 nix::fcntl::F_SETFD(nix::fcntl::FdFlag::empty()),
@@ -304,3 +302,12 @@ async fn test_session_leader_async() {
     eprintln!("{:?}", status);
     assert_eq!(status.code().unwrap(), 0);
 }
+
+fn pipe() -> (std::os::fd::OwnedFd, std::os::fd::OwnedFd) {
+    use std::os::fd::FromRawFd as _;
+
+    let (r, w) = nix::unistd::pipe().unwrap();
+    (unsafe { std::os::fd::OwnedFd::from_raw_fd(r) }, unsafe {
+        std::os::fd::OwnedFd::from_raw_fd(w)
+    })
+}
diff --git a/tests/pipe.rs b/tests/pipe.rs
index c3d7b9f..3c63602 100644
--- a/tests/pipe.rs
+++ b/tests/pipe.rs
@@ -1,16 +1,13 @@
 #[test]
 fn test_pipe_basic() {
-    use std::os::unix::io::FromRawFd as _;
-
-    let (read_fd, write_fd) =
-        nix::unistd::pipe2(nix::fcntl::OFlag::O_CLOEXEC).unwrap();
+    let (read_fd, write_fd) = pipe();
 
     let mut child_from = std::process::Command::new("seq");
     child_from.args(["1", "10"]);
-    child_from.stdout(unsafe { std::process::Stdio::from_raw_fd(write_fd) });
+    child_from.stdout(std::process::Stdio::from(write_fd));
 
     let mut child_to = std::process::Command::new("tac");
-    child_to.stdin(unsafe { std::process::Stdio::from_raw_fd(read_fd) });
+    child_to.stdin(std::process::Stdio::from(read_fd));
     child_to.stdout(std::process::Stdio::piped());
 
     assert!(child_from.status().unwrap().success());
@@ -23,23 +20,21 @@ fn test_pipe_basic() {
 #[test]
 fn test_pipe_blocking() {
     use std::io::Read as _;
-    use std::os::unix::io::FromRawFd as _;
 
-    let (read_fd, write_fd) =
-        nix::unistd::pipe2(nix::fcntl::OFlag::O_CLOEXEC).unwrap();
+    let (read_fd, write_fd) = pipe();
 
     let pty_from = pty_process::blocking::Pty::new().unwrap();
     let pts_from = pty_from.pts().unwrap();
     pty_from.resize(pty_process::Size::new(24, 80)).unwrap();
     let mut cmd_from = pty_process::blocking::Command::new("seq");
     cmd_from.args(["1", "10"]);
-    cmd_from.stdout(unsafe { std::process::Stdio::from_raw_fd(write_fd) });
+    cmd_from.stdout(std::process::Stdio::from(write_fd));
     let mut child_from = cmd_from.spawn(&pts_from).unwrap();
 
     let mut pty_to = pty_process::blocking::Pty::new().unwrap();
     let pts_to = pty_to.pts().unwrap();
     let mut cmd_to = pty_process::blocking::Command::new("tac");
-    cmd_to.stdin(unsafe { std::process::Stdio::from_raw_fd(read_fd) });
+    cmd_to.stdin(std::process::Stdio::from(read_fd));
     let mut child_to = cmd_to.spawn(&pts_to).unwrap();
 
     assert!(child_from.wait().unwrap().success());
@@ -62,24 +57,22 @@ fn test_pipe_blocking() {
 #[cfg(feature = "async")]
 #[tokio::test]
 async fn test_pipe_async() {
-    use std::os::unix::io::FromRawFd as _;
     use tokio::io::AsyncReadExt as _;
 
-    let (read_fd, write_fd) =
-        nix::unistd::pipe2(nix::fcntl::OFlag::O_CLOEXEC).unwrap();
+    let (read_fd, write_fd) = pipe();
 
     let pty_from = pty_process::Pty::new().unwrap();
     let pts_from = pty_from.pts().unwrap();
     pty_from.resize(pty_process::Size::new(24, 80)).unwrap();
     let mut cmd_from = pty_process::Command::new("seq");
     cmd_from.args(["1", "10"]);
-    cmd_from.stdout(unsafe { std::process::Stdio::from_raw_fd(write_fd) });
+    cmd_from.stdout(std::process::Stdio::from(write_fd));
     let mut child_from = cmd_from.spawn(&pts_from).unwrap();
 
     let mut pty_to = pty_process::Pty::new().unwrap();
     let pts_to = pty_to.pts().unwrap();
     let mut cmd_to = pty_process::Command::new("tac");
-    cmd_to.stdin(unsafe { std::process::Stdio::from_raw_fd(read_fd) });
+    cmd_to.stdin(std::process::Stdio::from(read_fd));
     let mut child_to = cmd_to.spawn(&pts_to).unwrap();
 
     assert!(child_from.wait().await.unwrap().success());
@@ -98,3 +91,12 @@ async fn test_pipe_async() {
 
     assert!(child_to.wait().await.unwrap().success());
 }
+
+fn pipe() -> (std::os::fd::OwnedFd, std::os::fd::OwnedFd) {
+    use std::os::fd::FromRawFd as _;
+
+    let (r, w) = nix::unistd::pipe2(nix::fcntl::OFlag::O_CLOEXEC).unwrap();
+    (unsafe { std::os::fd::OwnedFd::from_raw_fd(r) }, unsafe {
+        std::os::fd::OwnedFd::from_raw_fd(w)
+    })
+}