Merge #109

109: Update nix requirement from 0.26 to 0.27 r=matthiasbeyer a=dependabot[bot]

Updates the requirements on [nix](https://github.com/nix-rust/nix) to permit the latest version.


Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthias Beyer <[email protected]>
Co-authored-by: Kyle Huey <[email protected]>

Author: 4 people

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.63.0
+          - 1.65.0
           - stable
           - beta
     steps:
@@ -40,7 +40,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.63.0
+          - 1.65.0
           - stable
           - beta
           # - nightly
@@ -92,7 +92,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.63.0
+          toolchain: 1.65.0
           components: rustfmt
       - name: cargo-fmt
         run: cargo fmt -- --check

Cargo.toml

@@ -14,7 +14,7 @@ rust-version = "1.60"
 
 [dependencies]
 comma = "1.0"
-nix = "0.26"
+nix = { version = "0.27", features = ["fs", "process", "signal", "term"] }
 regex = "1"
 tempfile = "3"
 thiserror = "1.0.34"

README.md

@@ -3,7 +3,7 @@
 [![crates.io](https://img.shields.io/crates/v/rexpect.svg)](https://crates.io/crates/rexpect)
 [![Released API docs](https://docs.rs/rexpect/badge.svg)](https://docs.rs/rexpect)
 [![Master API docs](https://img.shields.io/badge/docs-master-2f343b.svg)](http://philippkeller.github.io/rexpect)
-[![MSRV](https://img.shields.io/badge/MSRV-1.63.0-blue)]
+[![MSRV](https://img.shields.io/badge/MSRV-1.65.0-blue)]
 
 Spawn, control, and respond to expected patterns of child applications and
 processes, enabling the automation of interactions and testing. Components

src/process.rs

@@ -10,6 +10,7 @@ use nix::sys::{stat, termios};
 use nix::unistd::{close, dup, dup2, fork, setsid, ForkResult, Pid};
 use std;
 use std::fs::File;
+use std::io;
 use std::os::unix::io::{AsRawFd, FromRawFd};
 use std::os::unix::process::CommandExt;
 use std::process::Command;
@@ -118,9 +119,10 @@ impl PtyProcess {
                 }
 
                 // set echo off
-                let mut flags = termios::tcgetattr(STDIN_FILENO)?;
+                let stdin = io::stdin();
+                let mut flags = termios::tcgetattr(&stdin)?;
                 flags.local_flags &= !termios::LocalFlags::ECHO;
-                termios::tcsetattr(STDIN_FILENO, termios::SetArg::TCSANOW, &flags)?;
+                termios::tcsetattr(&stdin, termios::SetArg::TCSANOW, &flags)?;
 
                 command.exec();
                 Err(Error::Nix(nix::Error::last()))