Skip to content

bump nix #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Detegr merged 1 commit into from
Feb 10, 2026
Merged

bump nix #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 130 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ readme = "README.md"
rust-version = "1.69.0"

[target.'cfg(unix)'.dependencies]
nix = { version = "0.30", default-features = false, features = ["signal"]}
nix = { version = "0.31", default-features = false, features = ["signal"]}

[target.'cfg(target_vendor = "apple")'.dependencies]
dispatch2 = "0.3"
Expand Down
6 changes: 3 additions & 3 deletions src/platform/unix/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ pub unsafe fn init_os_handler(overwrite: bool) -> Result<(), Error> {
signal::SigAction::new(handler, signal::SaFlags::empty(), signal::SigSet::empty());

let sigint_old = signal::sigaction(signal::Signal::SIGINT, &new_action)?;
if !overwrite && sigint_old.handler() != signal::SigHandler::SigDfl {
if !overwrite && !matches!(sigint_old.handler(), signal::SigHandler::SigDfl) {
signal::sigaction(signal::Signal::SIGINT, &sigint_old).unwrap();
return Err(nix::Error::EEXIST);
}
Expand All @@ -104,7 +104,7 @@ pub unsafe fn init_os_handler(overwrite: bool) -> Result<(), Error> {
return Err(e);
}
};
if !overwrite && sigterm_old.handler() != signal::SigHandler::SigDfl {
if !overwrite && !matches!(sigterm_old.handler(), signal::SigHandler::SigDfl) {
signal::sigaction(signal::Signal::SIGINT, &sigint_old).unwrap();
signal::sigaction(signal::Signal::SIGTERM, &sigterm_old).unwrap();
return Err(nix::Error::EEXIST);
Expand All @@ -117,7 +117,7 @@ pub unsafe fn init_os_handler(overwrite: bool) -> Result<(), Error> {
return Err(e);
}
};
if !overwrite && sighup_old.handler() != signal::SigHandler::SigDfl {
if !overwrite && !matches!(sighup_old.handler(), signal::SigHandler::SigDfl) {
signal::sigaction(signal::Signal::SIGINT, &sigint_old).unwrap();
signal::sigaction(signal::Signal::SIGTERM, &sigterm_old).unwrap();
signal::sigaction(signal::Signal::SIGHUP, &sighup_old).unwrap();
Expand Down