wip

doy · Jan 30, 2025 · 8c9f0d1 · 8c9f0d1
1 parent 9ffafe5
commit 8c9f0d1
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 28 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -1,7 +1,7 @@
 name: tests
 on:
   push:
-    branches: [main]
+    branches: [main, test]
   pull_request: {}
 env:
   RUST_BACKTRACE: 1

diff --git a/examples/basic.rs b/examples/basic.rs
@@ -81,7 +81,7 @@ fn main() {
     pty.resize(pty_process::Size::new(24, 80)).unwrap();
     let mut child = pty_process::blocking::Command::new("tac")
         // .args(&["500"])
-        .spawn(pts)
+        .spawn(&pts)
         .unwrap();
 
     main::run(&mut child, &mut pty);

diff --git a/examples/interhack.rs b/examples/interhack.rs
@@ -82,7 +82,7 @@ async fn main() {
 
     let (mut pty, pts) = pty_process::open().unwrap();
     pty.resize(pty_process::Size::new(24, 80)).unwrap();
-    let mut child = pty_process::Command::new("nethack").spawn(pts).unwrap();
+    let mut child = pty_process::Command::new("nethack").spawn(&pts).unwrap();
     main::run(&mut child, &mut pty).await.unwrap();
     let status = child.wait().await.unwrap();
     std::process::exit(

diff --git a/examples/tokio.rs b/examples/tokio.rs
@@ -54,7 +54,7 @@ async fn main() {
     pty.resize(pty_process::Size::new(24, 80)).unwrap();
     let mut child = pty_process::Command::new("tac")
         // .args(&["500"])
-        .spawn(pts)
+        .spawn(&pts)
         .unwrap();
     main::run(&mut child, &mut pty).await.unwrap();
     let status = child.wait().await.unwrap();

diff --git a/src/blocking/command.rs b/src/blocking/command.rs
@@ -129,9 +129,9 @@ impl Command {
     #[allow(clippy::needless_pass_by_value)]
     pub fn spawn(
         mut self,
-        pts: crate::blocking::Pts,
+        pts: &crate::blocking::Pts,
     ) -> crate::Result<std::process::Child> {
-        self.spawn_impl(&pts)
+        self.spawn_impl(pts)
     }
 
     /// Executes the command as a child process via

diff --git a/src/command.rs b/src/command.rs
@@ -134,9 +134,9 @@ impl Command {
     #[allow(clippy::needless_pass_by_value)]
     pub fn spawn(
         mut self,
-        pts: crate::Pts,
+        pts: &crate::Pts,
     ) -> crate::Result<tokio::process::Child> {
-        self.spawn_impl(&pts)
+        self.spawn_impl(pts)
     }
 
     /// Executes the command as a child process via

diff --git a/tests/basic.rs b/tests/basic.rs
@@ -7,7 +7,7 @@ fn test_cat_blocking() {
     let (mut pty, pts) = pty_process::blocking::open().unwrap();
     pty.resize(pty_process::Size::new(24, 80)).unwrap();
     let mut child = pty_process::blocking::Command::new("cat")
-        .spawn(pts)
+        .spawn(&pts)
         .unwrap();
 
     pty.write_all(b"foo\n").unwrap();
@@ -29,7 +29,7 @@ async fn test_cat_async() {
 
     let (mut pty, pts) = pty_process::open().unwrap();
     pty.resize(pty_process::Size::new(24, 80)).unwrap();
-    let mut child = pty_process::Command::new("cat").spawn(pts).unwrap();
+    let mut child = pty_process::Command::new("cat").spawn(&pts).unwrap();
 
     let (pty_r, mut pty_w) = pty.split();
 
@@ -51,7 +51,7 @@ async fn test_yes_async() {
 
     let (mut pty, pts) = pty_process::open().unwrap();
     pty.resize(pty_process::Size::new(24, 80)).unwrap();
-    let mut child = pty_process::Command::new("yes").spawn(pts).unwrap();
+    let mut child = pty_process::Command::new("yes").spawn(&pts).unwrap();
 
     let mut buf = [0u8; 3];
 

diff --git a/tests/behavior.rs b/tests/behavior.rs
@@ -229,7 +229,7 @@ fn test_controlling_terminal() {
     pty.resize(pty_process::Size::new(24, 80)).unwrap();
     let mut child = pty_process::blocking::Command::new("perl")
         .arg("-Eopen my $fh, '<', '/dev/tty' or die; if (-t $fh) { say 'true' } else { say 'false' }")
-        .spawn(pts)
+        .spawn(&pts)
         .unwrap();
 
     let mut output = helpers::output(&pty);
@@ -252,7 +252,7 @@ async fn test_controlling_terminal_async() {
             "-Eopen my $fh, '<', '/dev/tty' or die; \
                 if (-t $fh) { say 'true' } else { say 'false' }",
         )
-        .spawn(pts)
+        .spawn(&pts)
         .unwrap();
 
     let mut output = helpers::output_async(pty_r);
@@ -268,7 +268,7 @@ fn test_session_leader() {
     pty.resize(pty_process::Size::new(24, 80)).unwrap();
     let mut child = pty_process::blocking::Command::new("python")
         .arg("-cimport os; print(os.getpid() == os.getsid(0))")
-        .spawn(pts)
+        .spawn(&pts)
         .unwrap();
 
     let mut output = helpers::output(&pty);
@@ -287,7 +287,7 @@ async fn test_session_leader_async() {
     pty.resize(pty_process::Size::new(24, 80)).unwrap();
     let mut child = pty_process::Command::new("python")
         .arg("-cimport os; print(os.getpid() == os.getsid(0))")
-        .spawn(pts)
+        .spawn(&pts)
         .unwrap();
 
     let (pty_r, _) = pty.split();

diff --git a/tests/fds.rs b/tests/fds.rs
@@ -11,7 +11,7 @@ fn test_fds() {
     pty.resize(pty_process::Size::new(24, 80)).unwrap();
     let mut child = pty_process::blocking::Command::new("perl")
         .arg("-Efor my $fd (0..255) { open my $fh, \"<&=$fd\"; print $fd if stat $fh }; say")
-        .spawn(pts)
+        .spawn(&pts)
         .unwrap();
 
     let mut output = helpers::output(&pty);
@@ -20,14 +20,15 @@ fn test_fds() {
     let status = child.wait().unwrap();
     assert_eq!(status.code().unwrap(), 0);
     drop(pty);
+    drop(pts);
     check_open_fds(Some(&fds));
 
     let (pty, pts) = pty_process::blocking::open().unwrap();
     pty.resize(pty_process::Size::new(24, 80)).unwrap();
     let mut child = pty_process::blocking::Command::new("perl")
         .arg("-Efor my $fd (0..255) { open my $fh, \"<&=$fd\"; print $fd if stat $fh }; say")
         .stderr(std::process::Stdio::null())
-        .spawn(pts)
+        .spawn(&pts)
         .unwrap();
 
     let mut output = helpers::output(&pty);
@@ -36,6 +37,7 @@ fn test_fds() {
     let status = child.wait().unwrap();
     assert_eq!(status.code().unwrap(), 0);
     drop(pty);
+    drop(pts);
     check_open_fds(Some(&fds));
 }
 

diff --git a/tests/fds_async.rs b/tests/fds_async.rs
@@ -28,7 +28,7 @@ fn test_fds_async() {
                 }; \
                 say",
             )
-            .spawn(pts)
+            .spawn(&pts)
             .unwrap();
 
         let (pty_r, _) = pty.split();
@@ -52,7 +52,7 @@ fn test_fds_async() {
                 }; \
                 say",
             )
-            .spawn(pts)
+            .spawn(&pts)
             .unwrap();
 
         let (pty_r, _) = pty.split();
@@ -63,6 +63,7 @@ fn test_fds_async() {
         assert_eq!(status.code().unwrap(), 0);
         drop(output);
         drop(pty);
+        drop(pts);
 
         check_open_fds(&fds);
     });
@@ -75,7 +76,7 @@ fn test_fds_async() {
         let mut child = pty_process::Command::new("perl")
             .arg("-Efor my $fd (0..255) { open my $fh, \"<&=$fd\"; print $fd if stat $fh }; say")
             .stderr(std::process::Stdio::null())
-            .spawn(pts)
+            .spawn(&pts)
             .unwrap();
 
         let (pty_r, _) = pty.split();
@@ -86,6 +87,7 @@ fn test_fds_async() {
         assert_eq!(status.code().unwrap(), 0);
         drop(output);
         drop(pty);
+        drop(pts);
 
         check_open_fds(&fds);
     });

diff --git a/tests/pipe.rs b/tests/pipe.rs
@@ -34,13 +34,13 @@ fn test_pipe_blocking() {
     let cmd_from = pty_process::blocking::Command::new("seq")
         .args(["1", "10"])
         .stdout(std::process::Stdio::from(write_fd));
-    let mut child_from = cmd_from.spawn(pts_from).unwrap();
+    let mut child_from = cmd_from.spawn(&pts_from).unwrap();
 
     let (mut pty_to, pts_to) = pty_process::blocking::open().unwrap();
     let cmd_to = pty_process::blocking::Command::new("sh")
         .args(["-c", TAC])
         .stdin(std::process::Stdio::from(read_fd));
-    let mut child_to = cmd_to.spawn(pts_to).unwrap();
+    let mut child_to = cmd_to.spawn(&pts_to).unwrap();
 
     assert!(child_from.wait().unwrap().success());
 
@@ -70,13 +70,13 @@ async fn test_pipe_async() {
     let cmd_from = pty_process::Command::new("seq")
         .args(["1", "10"])
         .stdout(std::process::Stdio::from(write_fd));
-    let mut child_from = cmd_from.spawn(pts_from).unwrap();
+    let mut child_from = cmd_from.spawn(&pts_from).unwrap();
 
     let (mut pty_to, pts_to) = pty_process::open().unwrap();
     let cmd_to = pty_process::Command::new("sh")
         .args(["-c", TAC])
         .stdin(std::process::Stdio::from(read_fd));
-    let mut child_to = cmd_to.spawn(pts_to).unwrap();
+    let mut child_to = cmd_to.spawn(&pts_to).unwrap();
 
     assert!(child_from.wait().await.unwrap().success());
 

diff --git a/tests/split.rs b/tests/split.rs
@@ -10,7 +10,7 @@ async fn test_split() {
     pty.resize(pty_process::Size::new(24, 80)).unwrap();
     let cmd = pty_process::Command::new("perl")
         .args(["-plE", "BEGIN { $SIG{WINCH} = sub { say 'WINCH' } }"]);
-    let mut child = cmd.spawn(pts).unwrap();
+    let mut child = cmd.spawn(&pts).unwrap();
 
     {
         pty.write_all(b"foo\n").await.unwrap();
@@ -48,7 +48,7 @@ async fn test_into_split() {
     pty.resize(pty_process::Size::new(24, 80)).unwrap();
     let cmd = pty_process::Command::new("perl")
         .args(["-plE", "BEGIN { $SIG{WINCH} = sub { say 'WINCH' } }"]);
-    let mut child = cmd.spawn(pts).unwrap();
+    let mut child = cmd.spawn(&pts).unwrap();
 
     {
         pty.write_all(b"foo\n").await.unwrap();

diff --git a/tests/winch.rs b/tests/winch.rs
@@ -11,7 +11,7 @@ fn test_winch_std() {
             "-E",
             "$|++; $SIG{WINCH} = sub { say 'WINCH' }; say 'started'; <>",
         ])
-        .spawn(pts)
+        .spawn(&pts)
         .unwrap();
 
     let mut output = helpers::output(&pty);
@@ -38,7 +38,7 @@ async fn test_winch_async() {
             "-E",
             "$|++; $SIG{WINCH} = sub { say 'WINCH' }; say 'started'; <>",
         ])
-        .spawn(pts)
+        .spawn(&pts)
         .unwrap();
 
     let (pty_r, mut pty_w) = pty.split();