From 598e6998d399e471d3a88f99b52f81ee1cd53b3d Mon Sep 17 00:00:00 2001
From: 4lDO2 <4lDO2@protonmail.com>
Date: Sun, 27 Mar 2022 12:01:52 +0200
Subject: [PATCH] Fix compilation when using newest nix
---
src/binary/mod.rs | 2 +-
src/lib/shell/pipe_exec/job_control.rs | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/binary/mod.rs b/src/binary/mod.rs
index 46a13979..8cd4d22d 100644
--- a/src/binary/mod.rs
+++ b/src/binary/mod.rs
@@ -352,7 +352,7 @@ impl<'a> InteractiveShell<'a> {
.write(true)
.open(if cfg!(target_os = "redox") { "null:" } else { "/dev/null" })
.map_err(|err| {
- nix::Error::from_errno(nix::errno::Errno::from_i32(err.raw_os_error().unwrap()))
+ nix::errno::Errno::from_i32(err.raw_os_error().unwrap())
})?
.into_raw_fd();
diff --git a/src/lib/shell/pipe_exec/job_control.rs b/src/lib/shell/pipe_exec/job_control.rs
index 2fbca08c..4634a09a 100644
--- a/src/lib/shell/pipe_exec/job_control.rs
+++ b/src/lib/shell/pipe_exec/job_control.rs
@@ -146,7 +146,7 @@ impl<'a> Shell<'a> {
opts.insert(WaitPidFlag::WCONTINUED);
opts.insert(WaitPidFlag::WNOHANG);
match wait::waitpid(Pid::from_raw(-pgid.as_raw()), Some(opts)) {
- Err(nix::Error::Sys(nix::errno::Errno::ECHILD)) => {
+ Err(nix::errno::Errno::ECHILD) => {
if !fg_was_grabbed {
if let Some(ref callback) = &background_event {
callback(njob, pgid, BackgroundEvent::Exited(exit_status));
@@ -257,7 +257,7 @@ impl<'a> Shell<'a> {
loop {
match wait::waitpid(Pid::from_raw(-group.as_raw()), Some(WaitPidFlag::WUNTRACED)) {
Err(err) => match err {
- nix::Error::Sys(nix::errno::Errno::ECHILD) => {
+ nix::errno::Errno::ECHILD => {
if let Some(signal) = signaled {
break Err(signal);
} else {
--
GitLab