Merge #1265

1265: use signal-hook instead of ctrlc r=Emilgardis a=Emilgardis

Fixes #1264

Co-authored-by: Emil Gardström <[email protected]>

Author: bors[bot]

.changes/1265.json

@@ -0,0 +1,4 @@
+{
+    "description": "replace `ctrlc` signal handler with `signal-hook`",
+    "type": "changed"
+}

Cargo.lock

@@ -42,7 +42,7 @@ serde_json = "1.0.91"
 serde_ignored = "0.1.7"
 shell-words = "1.1.0"
 const-sha1 = "0.2.0"
-ctrlc = { version = "3.2.4", features = ["termination"] }
+signal-hook = { version = "0.3.15" }
 directories = "4.0.1"
 walkdir = { version = "2.3.2", optional = true }
 tempfile = "3.3.0"

Cargo.toml

@@ -111,7 +111,11 @@ unsafe fn termination_handler() {
 
 pub fn install_termination_hook() -> Result<()> {
     // SAFETY: safe since single-threaded execution.
-    ctrlc::set_handler(|| unsafe { termination_handler() }).map_err(Into::into)
+    unsafe {
+        signal_hook::low_level::register(signal_hook::consts::SIGINT, || termination_handler())
+    }
+    .map_err(Into::into)
+    .map(|_| ())
 }
 
 #[derive(Debug, thiserror::Error)]