]> Untitled Git - lemmy.git/commitdiff
Merge branch 'master' into federation
authorFelix <me@nutomic.com>
Tue, 14 Jan 2020 15:26:19 +0000 (16:26 +0100)
committerFelix <me@nutomic.com>
Tue, 14 Jan 2020 15:30:54 +0000 (16:30 +0100)
1  2 
server/Cargo.lock
server/Cargo.toml
server/src/api/community.rs
server/src/apub/mod.rs
server/src/apub/puller.rs
server/src/routes/federation.rs
server/src/routes/webfinger.rs
server/src/websocket/server.rs
ui/src/components/post-form.tsx
ui/src/components/post.tsx

index d94fcdee491ec1eb00a0e3c0a5556fca5a368652,16a51fab83ae37401f954559339cd81aeaac7c9e..3ddedd77eacbabbe2cf95aa5a11b824a0d19d878
@@@ -529,14 -571,17 +571,27 @@@ name = "byteorder
  version = "1.3.2"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
-  "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +[[package]]
 +name = "bytes"
 +version = "0.4.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
+ [[package]]
+ name = "bytes"
+ version = "0.5.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ [[package]]
+ name = "bytestring"
+ version = "0.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
  [[package]]
@@@ -593,32 -636,6 +646,32 @@@ dependencies = 
   "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
-  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 +[[package]]
 +name = "cookie"
 +version = "0.12.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "cookie_store"
 +version = "0.7.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 + "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 + "publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
 + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 + "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "copyless"
  version = "0.1.4"
@@@ -648,50 -665,20 +701,59 @@@ dependencies = 
  
  [[package]]
  name = "crossbeam-channel"
- version = "0.3.8"
+ version = "0.4.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
-  "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
-  "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
- version = "0.7.1"
 +[[package]]
 +name = "crossbeam-deque"
-  "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++version = "0.7.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
- version = "0.7.2"
++ "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "crossbeam-epoch"
-  "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
-  "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-  "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
-  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++version = "0.8.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-  "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "crossbeam-queue"
 +version = "0.1.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
- version = "0.6.5"
++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "crossbeam-utils"
++version = "0.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
+ [[package]]
+ name = "crossbeam-utils"
+ version = "0.7.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
-  "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
  [[package]]
@@@ -950,21 -930,13 +1005,21 @@@ dependencies = 
   "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
 +[[package]]
 +name = "error-chain"
 +version = "0.12.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "failure"
- version = "0.1.5"
+ version = "0.1.6"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
-  "backtrace 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)",
-  "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+  "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
+  "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
  [[package]]
@@@ -1039,18 -1011,94 +1094,108 @@@ name = "fuchsia-zircon-sys
  version = "0.3.3"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
-  "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +[[package]]
 +name = "futures"
 +version = "0.1.29"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
+ [[package]]
+ name = "futures"
+ version = "0.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-executor 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ [[package]]
+ name = "futures-channel"
+ version = "0.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ [[package]]
+ name = "futures-core"
+ version = "0.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
 +[[package]]
 +name = "futures-cpupool"
 +version = "0.1.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
+ [[package]]
+ name = "futures-executor"
+ version = "0.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ [[package]]
+ name = "futures-io"
+ version = "0.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ [[package]]
+ name = "futures-macro"
+ version = "0.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+  "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ [[package]]
+ name = "futures-sink"
+ version = "0.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ [[package]]
+ name = "futures-task"
+ version = "0.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ [[package]]
+ name = "futures-util"
+ version = "0.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-macro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+  "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ [[package]]
+ name = "fxhash"
+ version = "0.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
  [[package]]
@@@ -1063,46 -1111,46 +1208,63 @@@ dependencies = 
  
  [[package]]
  name = "getrandom"
- version = "0.1.6"
+ version = "0.1.13"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
-  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+  "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
- version = "0.1.25"
 +[[package]]
 +name = "h2"
-  "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
-  "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
++version = "0.1.26"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
++ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
++ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 + "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
- name = "hashbrown"
- version = "0.3.1"
+ name = "h2"
+ version = "0.2.1"
  source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "tokio 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+  "tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
  
  [[package]]
- name = "hashbrown"
- version = "0.5.0"
+ name = "heck"
+ version = "0.3.1"
  source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
  
  [[package]]
- name = "heck"
- version = "0.3.1"
+ name = "hermit-abi"
+ version = "0.1.5"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
-  "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
  [[package]]
@@@ -1130,27 -1178,16 +1292,37 @@@ name = "htmlescape
  version = "0.3.1"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
- version = "0.1.17"
 +[[package]]
 +name = "http"
-  "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
++version = "0.1.21"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 + "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
+ [[package]]
+ name = "http"
+ version = "0.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
 +[[package]]
 +name = "http-body"
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
++ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "httparse"
  version = "1.3.4"
@@@ -1158,68 -1195,17 +1330,68 @@@ source = "registry+https://github.com/r
  
  [[package]]
  name = "humantime"
- version = "1.2.0"
+ version = "1.3.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
-  "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
-  "h2 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
-  "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
 +[[package]]
 +name = "hyper"
 +version = "0.12.35"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
 + "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
++ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
 + "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-  "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 + "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 + "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
 + "want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "hyper-tls"
 +version = "0.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
 + "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
 + "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "ident_case"
  version = "1.0.1"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
-  "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +[[package]]
 +name = "idna"
 +version = "0.1.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 + "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "idna"
  version = "0.2.0"
@@@ -1326,18 -1312,17 +1498,18 @@@ dependencies = 
   "hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
   "htmlescape 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "jsonwebtoken 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
   "lettre_email 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
   "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
   "rss 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+  "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
   "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "strum 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "strum_macros 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
  [[package]]
@@@ -1435,6 -1415,6 +1602,11 @@@ name = "matches
  version = "0.1.8"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
++[[package]]
++name = "maybe-uninit"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
  [[package]]
  name = "memchr"
  version = "0.1.11"
@@@ -1656,53 -1618,16 +1818,26 @@@ source = "registry+https://github.com/r
  
  [[package]]
  name = "openssl-sys"
- version = "0.9.52"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-  "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
-  "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
-  "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- [[package]]
- name = "owning_ref"
- version = "0.4.0"
+ version = "0.9.53"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
-  "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- [[package]]
- name = "parking_lot"
- version = "0.7.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-  "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- [[package]]
- name = "parking_lot"
- version = "0.8.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+  "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+  "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
-  "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +[[package]]
 +name = "parking_lot"
 +version = "0.9.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
++ "lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "parking_lot"
  version = "0.10.0"
@@@ -1712,45 -1637,30 +1847,49 @@@ dependencies = 
   "parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
- version = "0.4.0"
 +[[package]]
 +name = "parking_lot_core"
-  "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++version = "0.6.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-  "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "parking_lot_core"
- version = "0.5.0"
+ version = "0.7.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
-  "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
   "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
   "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+  "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
- name = "parking_lot_core"
- version = "0.6.2"
 +[[package]]
++name = "percent-encoding"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
+ [[package]]
+ name = "percent-encoding"
+ version = "2.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ [[package]]
+ name = "pin-project"
+ version = "0.4.6"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
-  "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-  "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
-  "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pin-project-internal 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
  [[package]]
@@@ -1810,21 -1724,17 +1953,29 @@@ dependencies = 
   "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
-  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ [[package]]
+ name = "proc-macro2"
+ version = "1.0.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
 +[[package]]
 +name = "publicsuffix"
 +version = "1.5.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "quick-error"
- version = "1.2.2"
+ version = "1.2.3"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
  [[package]]
@@@ -2067,42 -1971,9 +2212,42 @@@ name = "remove_dir_all
  version = "0.5.2"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
-  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
-  "encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)",
-  "flate2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
 +[[package]]
 +name = "reqwest"
 +version = "0.9.24"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 + "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)",
++ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
-  "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
-  "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
 + "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)",
 + "hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 + "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
 + "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
 + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winreg 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
 + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "resolv-conf"
  version = "0.6.2"
@@@ -2292,17 -2170,17 +2444,28 @@@ dependencies = 
   "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
-  "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)",
 +[[package]]
 +name = "serde_urlencoded"
 +version = "0.5.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 + "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
+ [[package]]
+ name = "serde_urlencoded"
+ version = "0.6.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+  "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
  [[package]]
  name = "sha1"
  version = "0.6.0"
@@@ -2342,14 -2211,9 +2496,17 @@@ name = "slab
  version = "0.4.2"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
- version = "0.6.10"
 +[[package]]
 +name = "smallvec"
++version = "0.6.13"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
 +
  [[package]]
  name = "smallvec"
- version = "1.0.0"
+ version = "1.1.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
  [[package]]
@@@ -2369,18 -2233,10 +2526,18 @@@ version = "0.5.2
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
  [[package]]
- name = "stable_deref_trait"
- version = "1.1.1"
+ name = "static_assertions"
+ version = "0.3.4"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
 +[[package]]
 +name = "string"
 +version = "0.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "strsim"
  version = "0.5.2"
@@@ -2515,172 -2371,42 +2672,165 @@@ name = "time
  version = "0.1.42"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
-  "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
   "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
-  "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
-  "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +[[package]]
 +name = "tokio"
 +version = "0.1.22"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
- name = "tokio-buf"
- version = "0.1.1"
+ name = "tokio"
+ version = "0.2.9"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
-  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
-  "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+  "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+  "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
+  "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pin-project-lite 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
- name = "tokio-codec"
 +[[package]]
-  "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++name = "tokio-buf"
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "tokio-current-thread"
 +version = "0.1.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- version = "0.1.8"
++ "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "tokio-executor"
-  "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++version = "0.1.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-  "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "tokio-io"
 +version = "0.1.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- version = "0.1.9"
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "tokio-reactor"
-  "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++version = "0.1.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
-  "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
-  "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-sync 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- [[package]]
- name = "tokio-signal"
- version = "0.2.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
-  "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
-  "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
-  "signal-hook 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- version = "0.1.6"
++ "tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "tokio-sync"
-  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
++version = "0.1.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "tokio-tcp"
 +version = "0.1.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
 + "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-  "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "tokio-threadpool"
 +version = "0.1.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-  "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
-  "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
 + "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- version = "0.2.11"
++ "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "tokio-timer"
-  "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++version = "0.2.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
-  "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
 + "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
- name = "tokio-udp"
- version = "0.1.3"
+ name = "tokio-util"
+ version = "0.2.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
-  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
-  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
-  "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
-  "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+  "bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pin-project-lite 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "tokio 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
  [[package]]
@@@ -2717,38 -2438,25 +2862,38 @@@ dependencies = 
  
  [[package]]
  name = "trust-dns-resolver"
- version = "0.11.1"
+ version = "0.18.0-alpha.2"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
-  "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+  "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+  "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "ipconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
+  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
   "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
   "resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-  "trust-dns-proto 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "tokio 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+  "trust-dns-proto 0.18.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
-  "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 +[[package]]
 +name = "try-lock"
 +version = "0.2.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
 +[[package]]
 +name = "try_from"
 +version = "0.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "typenum"
- version = "1.10.0"
+ version = "1.11.2"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
  [[package]]
@@@ -2795,17 -2503,6 +2940,16 @@@ name = "untrusted
  version = "0.6.2"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
-  "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
 +[[package]]
 +name = "url"
 +version = "1.7.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 + "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 + "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "url"
  version = "2.1.0"
@@@ -2868,16 -2564,16 +3011,26 @@@ name = "version_check
  version = "0.1.5"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
-  "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ [[package]]
+ name = "version_check"
+ version = "0.9.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
 +[[package]]
 +name = "want"
 +version = "0.2.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 + "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
+ [[package]]
+ name = "wasi"
+ version = "0.7.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
  [[package]]
  name = "widestring"
  version = "0.4.0"
@@@ -3007,24 -2707,20 +3164,27 @@@ dependencies = 
  "checksum bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8"
  "checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
  "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
- "checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
- "checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d"
- "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
- "checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe"
 +"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
+ "checksum bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "10004c15deb332055f7a4a208190aed362cf9a7c2f6ab70a305fba50e1105f38"
+ "checksum bytestring 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b24c107a4432e408d2caa58d3f5e763b219236221406ea58a4076b62343a039d"
+ "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
+ "checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76"
+ "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+ "checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01"
  "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
- "checksum config 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f9107d78ed62b3fa5a86e7d18e647abed48cfd8f8fab6c72f4cdb982d196f7e6"
+ "checksum config 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3"
 +"checksum cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5"
 +"checksum cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c"
  "checksum copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6ff9c56c9fb2a49c05ef0e431485a22400af20d33226dc0764d891d09e724127"
  "checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
  "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
  "checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
- "checksum crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f0ed1a4de2235cabda8558ff5840bffb97fcb64c97827f354a451307df5f72b"
- "checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71"
- "checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9"
+ "checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
++"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
++"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
 +"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
- "checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"
++"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
+ "checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
  "checksum darling 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fcfbcb0c5961907597a7d1148e3af036268f2b773886b8bb3eeb1e1281d3d3d6"
  "checksum darling_core 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6afc018370c3bff3eb51f89256a6bdb18b4fdcda72d577982a14954a7a0b402c"
  "checksum darling_macro 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d8dac1c6f1d29a41c4712b4400f878cb4fcc4c7628f298dd75038e024998d1"
  "checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
  "checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
  "checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
- "checksum encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "4155785c79f2f6701f185eb2e6b4caf0555ec03477cb4c70db67b465311620ed"
- "checksum enum-as-inner 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3d58266c97445680766be408285e798d3401c6d4c378ec5552e78737e681e37d"
- "checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
+ "checksum encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28"
+ "checksum enum-as-inner 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "900a6c7fbe523f4c2884eaf26b57b81bb69b6810a01a236390a7ac021d09492e"
+ "checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
 +"checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9"
- "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
- "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
+ "checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
+ "checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
  "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
  "checksum fast_chemail 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)" = "495a39d30d624c2caabe6312bfead73e7717692b44e0b32df168c275a2e8e9e4"
- "checksum flate2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "550934ad4808d5d39365e5d61727309bf18b3b02c6c56b729cb92e7dd84bc3d8"
+ "checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
  "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
  "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
  "checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
  "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
  "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
  "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 +"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
+ "checksum futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b6f16056ecbb57525ff698bb955162d0cd03bee84e6241c27ff75c08d8ca5987"
+ "checksum futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fcae98ca17d102fd8a3603727b9259fcf7fa4239b603d2142926189bc8999b86"
+ "checksum futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "79564c427afefab1dfb3298535b21eda083ef7935b4f0ecbfcb121f0aec10866"
 +"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
+ "checksum futures-executor 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e274736563f686a837a0568b478bdabfeaec2dca794b5649b04e2fe1627c231"
+ "checksum futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e676577d229e70952ab25f3945795ba5b16d63ca794ca9d2c860e5595d20b5ff"
+ "checksum futures-macro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "52e7c56c15537adb4f76d0b7a76ad131cb4d2f4f32d3b0bcabcbe1c7c5e87764"
+ "checksum futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "171be33efae63c2d59e6dbba34186fe0d6394fb378069a76dfd80fdcffd43c16"
+ "checksum futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0bae52d6b29cf440e298856fec3965ee6fa71b06aa7495178615953fd669e5f9"
+ "checksum futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d66274fb76985d3c62c886d1da7ac4c0903a8c9f754e8fe0f35a6a6cc39e76"
+ "checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
  "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
- "checksum getrandom 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e65cce4e5084b14874c4e7097f38cab54f47ee554f9194673456ea379dcc4c55"
- "checksum h2 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "a539b63339fbbb00e081e84b6e11bd1d9634a82d91da2984a18ac74a8823f392"
- "checksum hashbrown 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "29fba9abe4742d586dfd0c06ae4f7e73a1c2d86b856933509b269d82cdf06e18"
- "checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353"
+ "checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
++"checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
+ "checksum h2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9433d71e471c1736fd5a61b671fc0b148d7a2992f666c958d03cd8feb3b88d1"
  "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+ "checksum hermit-abi 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f629dc602392d3ec14bfc8a09b5e644d7ffd725102b48b81e59f90f2633621d7"
  "checksum hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0849d73a64ec77d1c8354aff489cf31943c4b4d3716de1eabfba572c70fde530"
  "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
  "checksum htmlescape 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163"
- "checksum http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "eed324f0f0daf6ec10c474f150505af2c143f251722bf9dbd1261bd1f2ee2c1a"
++"checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
+ "checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b"
 +"checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d"
  "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
- "checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
+ "checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
 +"checksum hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)" = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6"
 +"checksum hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f"
  "checksum ident_case 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 +"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
  "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
- "checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d"
- "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
+ "checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
+ "checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
  "checksum ipconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa79fa216fbe60834a9c0737d7fcd30425b32d1c58854663e24d4c4b328ed83f"
  "checksum itoa 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae3088ea4baeceb0284ee9eea42f591226e6beaecf65373e41b38d95a1b8e7a1"
  "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
  "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
  "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
  "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
- "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
+ "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
  "checksum lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c66afaa5dfadbb81d4e00fd1d1ab057c7cd4c799c5a44e0009386d553587e728"
  "checksum lettre_email 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bbb68ca999042d965476e47bbdbacd52db0927348b6f8062c44dd04a3b1fd43b"
- "checksum libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)" = "d44e80633f007889c7eff624b709ab43c92d708caad982295768a7b13ca3b5eb"
+ "checksum lexical-core 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2304bccb228c4b020f3a4835d247df0a02a7c4686098d4167762cfbbe4c5cb14"
+ "checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
  "checksum linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"
  "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
- "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
- "checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff"
- "checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc"
- "checksum log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c275b6ad54070ac2d665eef9197db647b32239c9d244bfb6f041a766d00da5b3"
+ "checksum lock_api 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e57b3997725d2b60dbec1297f6c2e2957cc383db1cebd6be812163f969c7d586"
+ "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
  "checksum lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
  "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
++"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
  "checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
  "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
 +"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
  "checksum migrations_internals 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8089920229070f914b9ce9b07ef60e175b2b9bc2d35c3edd8bf4433604e863b9"
- "checksum migrations_macros 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1664412abf7db2b8a6d58be42a38b099780cc542b5b350383b805d88932833fe"
- "checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425"
+ "checksum migrations_macros 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "719ef0bc7f531428764c9b70661c14abd50a7f3d21f355752d9985aa21251c9e"
+ "checksum mime 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "dd1d63acd1b78403cc0c325605908475dd9b9a3acbf65ed8bcab97e27014afcf"
  "checksum mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599"
- "checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202"
- "checksum miniz_oxide 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c061edee74a88eb35d876ce88b94d77a0448a201de111c244b70d047f5820516"
- "checksum miniz_oxide_c_api 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6c675792957b0d19933816c4e1d56663c341dd9bfa31cb2140ff2267c1d8ecf4"
- "checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23"
+ "checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625"
+ "checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
  "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125"
  "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
  "checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e"
  "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
  "checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
  "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
+ "checksum nom 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c618b63422da4401283884e6668d39f819a106ef51f5f59b81add00075da35ca"
  "checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
  "checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
- "checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
- "checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273"
- "checksum opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409"
- "checksum openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2f372b2b53ce10fb823a337aaa674e3a7d072b957c6264d0f4ff0bd86e657449"
+ "checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"
+ "checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
+ "checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
+ "checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585"
  "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
- "checksum openssl-sys 0.9.52 (registry+https://github.com/rust-lang/crates.io-index)" = "c977d08e1312e2f7e4b86f9ebaa0ed3b19d1daff75fae88bbb88108afbd801fc"
- "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
+ "checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
  "checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc"
- "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
- "checksum parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa7767817701cce701d5585b9c4db3cdd02086398322c1d7e8bf5094a96a2ce7"
 +"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
- "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
- "checksum parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb88cb1cb3790baa6776844f968fea3be44956cf184fa1be5a03341f5491278c"
 +"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
  "checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1"
 +"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
  "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
- "checksum pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea"
- "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
+ "checksum pin-project 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "94b90146c7216e4cb534069fb91366de4ea0ea353105ee45ed297e2d1619e469"
+ "checksum pin-project-internal 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "44ca92f893f0656d3cba8158dd0f2b99b94de256a4a54e870bd6922fcc6c8355"
+ "checksum pin-project-lite 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e8822eb8bb72452f038ebf6048efa02c3fe22bf83f76519c9583e47fc194a422"
+ "checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587"
+ "checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
+ "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
  "checksum pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6ac25eee5a0582f45a67e837e350d784e7003bd29a5f460796772061ca49ffda"
- "checksum proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7"
+ "checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
+ "checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
  "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
- "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
+ "checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc"
 +"checksum publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b"
+ "checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
  "checksum quick-xml 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0a8b2062cd4735d683121dbd525f5961226936229b0ac6bbbc40b34155744a41"
- "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
- "checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
  "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
- "checksum r2d2 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "22b5c5fc5fba064373f03887337b412e0e1562d63023393db77251146cb75553"
+ "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+ "checksum r2d2 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1497e40855348e4a8a40767d8e55174bce1e445a3ac9254ad44ad468ee0485af"
  "checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
  "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
- "checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c"
+ "checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
  "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
- "checksum rand_chacha 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e193067942ef6f485a349a113329140d0ab9e2168ce92274499bb0e9a4190d9d"
+ "checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
  "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
- "checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
- "checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca"
+ "checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+ "checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
  "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
  "checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
  "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
  "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
  "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
  "checksum serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
- "checksum serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)" = "d46b3dfedb19360a74316866cef04687cd4d6a70df8e6a506c63512790769b72"
+ "checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
  "checksum serde-hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153"
- "checksum serde_derive 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)" = "c22a0820adfe2f257b098714323563dd06426502abbbce4f51b72ef544c5027f"
+ "checksum serde-hjson 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8"
+ "checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
  "checksum serde_json 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = "67f7d2e9edc3523a9c8ec8cd6ec481b3a27810aafee3e625d311febd3e656b4c"
- "checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704"
+ "checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7"
  "checksum serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5"
 +"checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
+ "checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
  "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
  "checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d"
- "checksum signal-hook 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4f61c4d59f3aaa9f61bba6450a9b80ba48362fd7d651689e7a10c453b1f6dc68"
- "checksum signal-hook-registry 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cded4ffa32146722ec54ab1f16320568465aa922aa9ab4708129599740da85d7"
+ "checksum signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41"
  "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
- "checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
- "checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86"
- "checksum socket2 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "4e626972d3593207547f14bf5fc9efa4d0e7283deb73fef1dff313dae9ab8878"
- "checksum spin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44363f6f51401c34e7be73db0db371c04705d35efbe9f7d6082e03a921a32c55"
- "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
++"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
+ "checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4"
+ "checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85"
+ "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+ "checksum static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7f3eb36b47e512f8f1c9e3d10c2c1965bc992bd9cdb024fa581e2194501c83d3"
 +"checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
  "checksum strsim 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "67f84c44fbb2f91db7fef94554e6b2ac05909c9c0b0bc23bb98d3a1aebfe7f7c"
  "checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
- "checksum strum 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f"
- "checksum strum_macros 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e"
- "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
- "checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
- "checksum syn 0.15.40 (registry+https://github.com/rust-lang/crates.io-index)" = "bc945221ccf4a7e8c31222b9d1fc77aefdd6638eb901a6ce457a3dc29d4c31e8"
- "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
- "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
+ "checksum strum 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "530efb820d53b712f4e347916c5e7ed20deb76a4f0457943b3182fb889b06d2c"
+ "checksum strum_macros 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6e163a520367c465f59e0a61a23cfae3b10b6546d78b6f672a382be79f7110"
+ "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
+ "checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8"
+ "checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
  "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
  "checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
+ "checksum thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6f357d1814b33bc2dc221243f8424104bfe72dbe911d5b71b3816a2dff1c977e"
+ "checksum thiserror-impl 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2e25d25307eb8436894f727aba8f65d07adf02e5b35a13cebed48bd282bfef"
  "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
  "checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
  "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
  "checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865"
  "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
- "checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
 +"checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
+ "checksum tokio 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ffa2fdcfa937b20cb3c822a635ceecd5fc1a27a6a474527e5516aa24b8c8820a"
 +"checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46"
- "checksum tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac"
 +"checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443"
- "checksum tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce"
- "checksum tokio-signal 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "dd6dc5276ea05ce379a16de90083ec80836440d5ef8a6a39545a3207373b8296"
- "checksum tokio-sync 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2162248ff317e2bc713b261f242b69dbb838b85248ed20bb21df56d60ea4cae7"
++"checksum tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ca6df436c42b0c3330a82d855d2ef017cd793090ad550a6bc2184f4b933532ab"
 +"checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926"
- "checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e"
- "checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
- "checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
- "checksum trust-dns-proto 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5559ebdf6c2368ddd11e20b11d6bbaf9e46deb803acd7815e93f5a7b4a6d2901"
- "checksum trust-dns-resolver 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c9992e58dba365798803c0b91018ff6c8d3fc77e06977c4539af2a6bfe0a039"
++"checksum tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "6732fe6b53c8d11178dcb77ac6d9682af27fc6d4cb87789449152e5377377146"
++"checksum tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76"
 +"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
 +"checksum tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c32ffea4827978e9aa392d2f743d973c1dfa3730a2ed3f22ce1e6984da848c"
- "checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
- "checksum unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a84e5511b2a947f3ae965dcb29b13b7b1691b6e7332cf5dbc1744138d5acb7f6"
++"checksum tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1739638e364e558128461fc1ad84d997702c8e31c2e6b18fb99842268199e827"
+ "checksum tokio-util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930"
+ "checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
+ "checksum trust-dns-proto 0.18.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2a7f3a2ab8a919f5eca52a468866a67ed7d3efa265d48a652a9a3452272b413f"
+ "checksum trust-dns-resolver 0.18.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6f90b1502b226f8b2514c6d5b37bafa8c200d7ca4102d57dc36ee0f3b7a04a2f"
 +"checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 +"checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b"
+ "checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
+ "checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
  "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
- "checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
- "checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9"
- "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
+ "checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf"
+ "checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
  "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+ "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
  "checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
 +"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
  "checksum url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61"
  "checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
  "checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
- "checksum v_escape 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8865501b78eef9193c1b45486acf18ba889e5662eba98854d6fc59d8ecf3542d"
- "checksum v_escape_derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "306896ff4b75998501263a1dc000456de442e21d68fe8c8bdf75c66a33a58e23"
- "checksum v_htmlescape 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7fbbe0fa88dd36f9c8cf61a218d4b953ba669de4d0785832f33cc72bd081e1be"
- "checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95"
+ "checksum v_escape 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "660b101c07b5d0863deb9e7fb3138777e858d6d2a79f9e6049a27d1cc77c6da6"
+ "checksum v_escape_derive 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c2ca2a14bc3fc5b64d188b087a7d3a927df87b152e941ccfbc66672e20c467ae"
+ "checksum v_htmlescape 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e33e939c0d8cf047514fb6ba7d5aac78bc56677a6938b2ee67000b91f2e97e41"
+ "checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
  "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
+ "checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
 +"checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230"
+ "checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
  "checksum widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effc0e4ff8085673ea7b9b2e3c73f6bd4d118810c9009ed8f1e16bd96c331db6"
  "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
- "checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+ "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
  "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
  "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
  "checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
index ef2343f4236b3cb85af3eff7843a2f8e86e9d816,5d00d6ee52e1cec933a589f09a495b69536e597d..3d198d19d94186059f102cac95107afa66eacd8e
@@@ -30,6 -31,5 +31,6 @@@ lettre_email = "0.9.2
  sha2 = "0.8.0"
  rss = "1.8.0"
  htmlescape = "0.3.1"
- config = "0.9.3"
+ config = "0.10.1"
  hjson = "0.8.2"
 +reqwest = "0.9.24"
Simple merge
Simple merge
index fe6f492ae91296eb716270398d7ef42f4e245773,0000000000000000000000000000000000000000..8b5c4cc46cdbc9317b3453e75be12154d2640665
mode 100644,000000..100644
--- /dev/null
@@@ -1,98 -1,0 +1,98 @@@
-   let mut communities2 = communities1.communities.to_owned();
 +extern crate reqwest;
 +
 +use self::reqwest::Error;
 +use crate::api::community::{GetCommunityResponse, ListCommunitiesResponse};
 +use crate::api::post::GetPosts;
 +use crate::api::UserOperation;
 +use crate::db::community_view::CommunityView;
 +use crate::naive_now;
 +use crate::settings::Settings;
 +use activitypub::actor::Group;
 +
 +// TODO: right now all of the data is requested on demand, for production we will need to store
 +//       things in the local database to not ruin the performance
 +
 +fn fetch_communities_from_instance(domain: &str) -> Result<Vec<CommunityView>, Error> {
 +  // TODO: check nodeinfo to make sure we are dealing with a lemmy instance
 +  //       -> means we need proper nodeinfo json classes instead of inline generation
 +  // TODO: follow pagination (seems like page count is missing?)
 +  // TODO: see if there is any standard for discovering remote actors, so we dont have to rely on lemmy apis
 +  let communities_uri = format!("http://{}/api/v1/communities/list?sort=Hot", domain);
 +  let communities1: ListCommunitiesResponse = reqwest::get(&communities_uri)?.json()?;
-   let x: Vec<&str> = identifier.split("@").collect();
++  let mut communities2 = communities1.communities;
 +  for c in &mut communities2 {
 +    c.name = format_community_name(&c.name, domain);
 +  }
 +  Ok(communities2)
 +}
 +
 +pub fn get_remote_community_posts(name: String) -> Result<GetPosts, Error> {
 +  // TODO: this is for urls like /c/!main@example.com, activitypub exposes it through the outbox
 +  //       https://www.w3.org/TR/activitypub/#outbox
 +  dbg!(name);
 +  unimplemented!()
 +}
 +
 +pub fn get_remote_community(identifier: String) -> Result<GetCommunityResponse, Error> {
++  let x: Vec<&str> = identifier.split('@').collect();
 +  let name = x[0].replace("!", "");
 +  let instance = x[1];
 +  let community_uri = format!("http://{}/federation/c/{}", instance, name);
 +  let community: Group = reqwest::get(&community_uri)?.json()?;
 +
 +  // TODO: looks like a bunch of data is missing from the activitypub response
 +  // TODO: i dont think simple numeric ids are going to work, we probably need something like uuids
 +  // TODO: why are the Group properties not typed?
 +  Ok(GetCommunityResponse {
 +    op: UserOperation::GetCommunity.to_string(),
 +    moderators: vec![],
 +    admins: vec![],
 +    community: CommunityView {
 +      id: -1,
 +      name: identifier.clone(),
 +      title: identifier,
 +      description: community.object_props.summary.map(|c| c.to_string()),
 +      category_id: -1,
 +      creator_id: -1,
 +      removed: false,
 +      published: naive_now(),     // TODO: community.object_props.published
 +      updated: Some(naive_now()), // TODO: community.object_props.updated
 +      deleted: false,
 +      nsfw: false,
 +      creator_name: "".to_string(),
 +      creator_avatar: None,
 +      category_name: "".to_string(),
 +      number_of_subscribers: -1,
 +      number_of_posts: -1,
 +      number_of_comments: -1,
 +      hot_rank: -1,
 +      user_id: None,
 +      subscribed: None,
 +    },
 +  })
 +}
 +
 +pub fn get_following_instances() -> Result<Vec<String>, Error> {
 +  let instance_list = match Settings::get().federated_instance.clone() {
 +    Some(f) => vec![f, Settings::get().hostname.clone()],
 +    None => vec![Settings::get().hostname.clone()],
 +  };
 +  Ok(instance_list)
 +}
 +
 +pub fn get_all_communities() -> Result<Vec<CommunityView>, Error> {
 +  let mut communities_list: Vec<CommunityView> = vec![];
 +  for instance in &get_following_instances()? {
 +    communities_list.append(fetch_communities_from_instance(instance)?.as_mut());
 +  }
 +  Ok(communities_list)
 +}
 +
 +/// If community is on local instance, don't include the @instance part
 +pub fn format_community_name(name: &str, instance: &str) -> String {
 +  if instance == Settings::get().hostname {
 +    format!("!{}", name)
 +  } else {
 +    format!("!{}@{}", name, instance)
 +  }
 +}
index 019a9a71b90dd6b30a09e75bd92532cf6eeb6521,ea6039d6bd34722d0cb306babe41fd3508562fbc..9667694a0c19dfa346d1d04b6311dbf1714bd1a6
@@@ -1,38 -1,18 +1,42 @@@
 +use crate::api::community::ListCommunities;
 +use crate::api::Perform;
 +use crate::api::{Oper, UserOperation};
  use crate::apub;
 -use actix_web::web;
 +use crate::settings::Settings;
 +use actix_web::web::Query;
 +use actix_web::{web, HttpResponse};
++use diesel::r2d2::{ConnectionManager, Pool};
++use diesel::PgConnection;
  
  pub fn config(cfg: &mut web::ServiceConfig) {
 -  cfg
 -    .route(
 -      "/federation/c/{community_name}",
 -      web::get().to(apub::community::get_apub_community),
 -    )
 -    .route(
 -      "/federation/c/{community_name}/followers",
 -      web::get().to(apub::community::get_apub_community_followers),
 -    )
 -    .route(
 -      "/federation/u/{user_name}",
 -      web::get().to(apub::user::get_apub_user),
 -    );
 +  if Settings::get().federation_enabled {
 +    println!("federation enabled, host is {}", Settings::get().hostname);
 +    cfg
 +      .route(
 +        "/federation/c/{community_name}",
 +        web::get().to(apub::community::get_apub_community),
 +      )
 +      .route(
 +        "/federation/c/{community_name}/followers",
 +        web::get().to(apub::community::get_apub_community_followers),
 +      )
 +      .route(
 +        "/federation/u/{user_name}",
 +        web::get().to(apub::user::get_apub_user),
 +      )
 +      // TODO: this is a very quick and dirty implementation for http api calls
 +      .route(
 +        "/api/v1/communities/list",
-         web::get().to(|query: Query<ListCommunities>| {
-           let res = Oper::new(UserOperation::ListCommunities, query.into_inner())
-             .perform()
-             .unwrap();
-           HttpResponse::Ok()
-             .content_type("application/json")
-             .body(serde_json::to_string(&res).unwrap())
-         }),
++        web::get().to(
++          |query: Query<ListCommunities>, db: web::Data<Pool<ConnectionManager<PgConnection>>>| {
++            let res = Oper::new(UserOperation::ListCommunities, query.into_inner())
++              .perform(&db.get().unwrap())
++              .unwrap();
++            HttpResponse::Ok()
++              .content_type("application/json")
++              .body(serde_json::to_string(&res).unwrap())
++          },
++        ),
 +      );
 +  }
  }
index 014eb2bcc8e072768d420373c2ed81c74e833083,20f76a9ad0c898598ae0a975cf5cf42bacf2d015..a078b487e9dfebcfa94c0590d42bf4e26fe7dee9
@@@ -72,25 -71,27 +71,27 @@@ async fn get_webfinger_response
        community_url,
      ],
      "links": [
 -    {
 -      "rel": "http://webfinger.net/rel/profile-page",
 -      "type": "text/html",
 -      "href": community_url
 -    },
 -    {
 -      "rel": "self",
 -      "type": "application/activity+json",
 -      // Yes this is correct, this link doesn't include the `.json` extension
 -      "href": community_url
 -    }
 -    // TODO: this also needs to return the subscribe link once that's implemented
 -    //{
 -    //  "rel": "http://ostatus.org/schema/1.0/subscribe",
 -    //  "template": "https://my_instance.com/authorize_interaction?uri={uri}"
 -    //}
 +      {
 +        "rel": "http://webfinger.net/rel/profile-page",
 +        "type": "text/html",
 +        "href": community.get_url(),
 +      },
 +      {
 +        "rel": "self",
 +        "type": "application/activity+json",
 +        // Yes this is correct, this link doesn't include the `.json` extension
 +        "href": community_url
 +      }
 +      // TODO: this also needs to return the subscribe link once that's implemented
 +      //{
 +      //  "rel": "http://ostatus.org/schema/1.0/subscribe",
 +      //  "template": "https://my_instance.com/authorize_interaction?uri={uri}"
 +      //}
      ]
-   });
-   HttpResponse::Ok()
-     .content_type("application/activity+json")
-     .body(json.to_string())
+     }))
+   })
+   .await
+   .map(|json| HttpResponse::Ok().json(json))
+   .map_err(|_| HttpResponse::InternalServerError())?;
+   Ok(res)
  }
index febd51fd49c53a2897f3faa58764b4607de1f154,006169dfb9e47ad6c0ea4f926a7a78058cc9c58d..c444e11bb215e7e90795776326c817f953b3d0b2
@@@ -357,35 -377,14 +378,35 @@@ fn parse_json_message(chat: &mut ChatSe
        Ok(serde_json::to_string(&res)?)
      }
      UserOperation::GetCommunity => {
 -      let get_community: GetCommunity = serde_json::from_str(data)?;
 -      let res = Oper::new(user_operation, get_community).perform(&conn)?;
 -      Ok(serde_json::to_string(&res)?)
 +      let mut get_community: GetCommunity = serde_json::from_str(data)?;
 +      if Settings::get().federation_enabled && get_community.name.is_some() {
 +        let name = &get_community.name.unwrap();
-         let remote_community = if name.contains("@") {
++        let remote_community = if name.contains('@') {
 +          // TODO: need to support sort, filter etc for remote communities
 +          get_remote_community(name.to_owned())?
 +        } else {
 +          get_community.name = Some(name.replace("!", ""));
-           Oper::new(user_operation, get_community).perform()?
++          Oper::new(user_operation, get_community).perform(&conn)?
 +        };
 +        Ok(serde_json::to_string(&remote_community)?)
 +      } else {
-         let res = Oper::new(user_operation, get_community).perform()?;
++        let res = Oper::new(user_operation, get_community).perform(&conn)?;
 +        Ok(serde_json::to_string(&res)?)
 +      }
      }
      UserOperation::ListCommunities => {
 -      let list_communities: ListCommunities = serde_json::from_str(data)?;
 -      let res = Oper::new(user_operation, list_communities).perform(&conn)?;
 -      Ok(serde_json::to_string(&res)?)
 +      if Settings::get().federation_enabled {
 +        let res = get_all_communities()?;
 +        let val = ListCommunitiesResponse {
 +          op: UserOperation::ListCommunities.to_string(),
 +          communities: res,
 +        };
 +        Ok(serde_json::to_string(&val)?)
 +      } else {
 +        let list_communities: ListCommunities = serde_json::from_str(data)?;
-         let res = Oper::new(user_operation, list_communities).perform()?;
++        let res = Oper::new(user_operation, list_communities).perform(&conn)?;
 +        Ok(serde_json::to_string(&res)?)
 +      }
      }
      UserOperation::CreateCommunity => {
        chat.check_rate_limit_register(msg.id)?;
Simple merge
Simple merge