From 1d7894f1be49775615eb4aa217e22e83385861fb Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Mon, 1 Jul 2019 22:52:49 -0700 Subject: [PATCH] Avoid signal-hook crate on windows (#4901) --- install/Cargo.toml | 3 +++ install/src/command.rs | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/install/Cargo.toml b/install/Cargo.toml index fdeab874a2..c72838d01a 100644 --- a/install/Cargo.toml +++ b/install/Cargo.toml @@ -39,6 +39,9 @@ tar = "0.4.26" tempdir = "0.3.7" url = "1.7.2" +[target."cfg(not(windows))".dependencies] +signal-hook = "0.1.9" + [target."cfg(windows)".dependencies] winapi = "0.3.7" winreg = "0.6" diff --git a/install/src/command.rs b/install/src/command.rs index a34dd647da..26be33061e 100644 --- a/install/src/command.rs +++ b/install/src/command.rs @@ -760,14 +760,15 @@ pub fn run( let mut child_option: Option = None; let mut now = Instant::now(); - let (signal_sender, signal_receiver) = mpsc::channel(); - if !cfg!(windows) { + let (_signal_sender, signal_receiver) = mpsc::channel(); + #[cfg(not(windows))] + { use signal_hook::{iterator::Signals, SIGTERM}; let signals = Signals::new(&[SIGTERM]).unwrap(); std::thread::spawn(move || { for sig in signals.forever() { eprintln!("run: received signal {:?}", sig); - let _ = signal_sender.send(()); + let _ = _signal_sender.send(()); } }); }