Skip to content

Commit 8786479

Browse files
committed
fix(process)!: Dont re-export whole modules
1 parent 642ca73 commit 8786479

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

src/process.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use nix;
55
use nix::fcntl::{OFlag, open};
66
use nix::libc::STDERR_FILENO;
77
use nix::pty::{PtyMaster, grantpt, posix_openpt, unlockpt};
8+
use nix::sys::{signal, wait};
89
use nix::sys::{stat, termios};
910
use nix::unistd::{
1011
ForkResult, Pid, close, dup, dup2_stderr, dup2_stdin, dup2_stdout, fork, setsid,
@@ -17,7 +18,6 @@ use std::os::unix::process::CommandExt;
1718
use std::process::Command;
1819
use std::{thread, time};
1920

20-
pub use nix::sys::{signal, wait};
2121
pub use signal::Signal;
2222
pub use wait::WaitStatus;
2323

src/session.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -484,17 +484,15 @@ pub fn spawn_stream<R: Read + Send + 'static, W: Write>(
484484
#[cfg(test)]
485485
mod tests {
486486
use super::*;
487+
use nix::sys::wait;
487488

488489
#[test]
489490
fn test_read_line() -> Result<(), Error> {
490491
let mut s = spawn("cat", Some(100000))?;
491492
s.send_line("hans")?;
492493
assert_eq!("hans", s.read_line()?);
493-
let should = crate::process::wait::WaitStatus::Signaled(
494-
s.process.child_pid,
495-
crate::process::signal::Signal::SIGTERM,
496-
false,
497-
);
494+
let should =
495+
wait::WaitStatus::Signaled(s.process.child_pid, crate::process::Signal::SIGTERM, false);
498496
assert_eq!(should, s.process.exit()?);
499497
Ok(())
500498
}

0 commit comments

Comments
 (0)