chan-signal PR accepted

3 files changed, 6 insertions, 17 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 804b6a0..3b2763d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3,7 +3,7 @@ name = "einhyrningsins"
 version = "0.1.0"
 dependencies = [
  "chan 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "chan-signal 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chan-signal 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "json 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "nix 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -48,8 +48,8 @@ dependencies = [
 
 [[package]]
 name = "chan-signal"
-version = "0.1.6"
-source = "git+https://github.com/bnewbold/chan-signal#bc3ab7a23b518a47f72f1e9f4b7d169286edd862"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bit-set 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "chan 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -58,12 +58,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "chan-signal"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-replace = "chan-signal 0.1.6 (git+https://github.com/bnewbold/chan-signal)"
-
-[[package]]
 name = "chrono"
 version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -339,8 +333,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dead7461c1127cf637931a1e50934eb6eee8bff2f74433ac7909e9afcee04a3"
 "checksum cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c"
 "checksum chan 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "82b22acfef7960fd8f829bc50749273be637cbd76b9d4cc20497666cc3a33329"
-"checksum chan-signal 0.1.6 (git+https://github.com/bnewbold/chan-signal)" = "<none>"
-"checksum chan-signal 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "afbba6202dc1d10ff08c3b04e00e4d2d6cf5effee56cd9fee92928be6692379a"
+"checksum chan-signal 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "365122ab60a9dc6240b48e39d011b4389c3853093d98bf586edd2b79bfb4fbfa"
 "checksum chrono 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00"
 "checksum encode_unicode 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "28d65f1f5841ef7c6792861294b72beda34c664deb8be27970f36c306b7da1ce"
 "checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685"
diff --git a/Cargo.toml b/Cargo.toml
index 7f6e03f..cb293ac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,13 +9,9 @@ getopts = "^0.2"
 timer = "0.1"
 time = "0.1"
 chan = "0.1"
-chan-signal = "0.1"
+chan-signal = "0.1.7"
 slog = "1.0"
 slog-term = "1.1"
 slog-syslog = "1.0.0-alpha"
 json = "*"
 rustyline = "1.0"
-
-[replace]
-"chan-signal:0.1.6" = { git = 'https://github.com/bnewbold/chan-signal' }
-
diff --git a/src/main.rs b/src/main.rs
index 8b2ef85..70373cd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -579,7 +579,7 @@ fn main() {
                                           Signal::TERM,
                                           Signal::PIPE,
                                           Signal::ALRM,
-                                          Signal::CHLD, // NB: PR has been submitted
+                                          Signal::CHLD,
                                           Signal::TTIN,
                                           Signal::TTOU,
                                           Signal::USR1,