build: upgrade portable-pty

arxanas · Mar 14, 2023 · fc998aa · fc998aa
1 parent 3eee58a
commit fc998aa
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/git-branchless-testing/Cargo.toml b/git-branchless-testing/Cargo.toml
@@ -14,7 +14,7 @@ itertools = "0.10.5"
 lazy_static = "1.4.0"
 lib = { package = "git-branchless-lib", version = "0.7.0", path = "../git-branchless-lib" }
 once_cell = "1.17.1"
-portable-pty = "0.7.0"
+portable-pty = "0.8.1"
 regex = "1.7.1"
 tempfile = "3.4.0"
 tracing = "0.1.37"

diff --git a/git-branchless-testing/src/lib.rs b/git-branchless-testing/src/lib.rs
@@ -791,9 +791,13 @@ pub mod pty {
         // Use the native pty implementation for the system
         let pty_system = native_pty_system();
         let pty_size = PtySize::default();
-        let mut pty = pty_system
+        let pty = pty_system
             .openpty(pty_size)
             .map_err(|e| eyre!("Could not open pty: {}", e))?;
+        let mut pty_master = pty
+            .master
+            .take_writer()
+            .map_err(|e| eyre!("Could not take PTY master writer: {e}"))?;
 
         // Spawn a git instance in the pty.
         let mut cmd = CommandBuilder::new(&git.path_to_git);
@@ -877,8 +881,8 @@ Screen contents:
                 }
 
                 PtyAction::Write(value) => {
-                    write!(pty.master, "{value}")?;
-                    pty.master.flush()?;
+                    write!(pty_master, "{value}")?;
+                    pty_master.flush()?;
                 }
             }
         }