From 9e9550ceeaa4d0751e8d1cb79acb962f1b8682d5 Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Thu, 10 Jan 2019 01:22:46 +0100
Subject: [PATCH] third_party: upgrade rust crates

---
 Cargo.lock                |  357 ++---
 Cargo.toml                |   50 +-
 build_extra/rust/BUILD.gn | 2598 +++++++++++++++++++++++--------------
 third_party               |    2 +-
 4 files changed, 1827 insertions(+), 1180 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index edaac90898..b35a1a3787 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 [[package]]
 name = "arc-swap"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -14,7 +14,7 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -37,22 +37,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "backtrace"
-version = "0.3.11"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace-sys 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "backtrace-sys"
-version = "0.1.26"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -75,7 +76,7 @@ name = "blake2-rfc"
 version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "arrayvec 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -95,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -116,6 +117,17 @@ name = "constant_time_eq"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "crossbeam-channel"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "crossbeam-deque"
 version = "0.6.3"
@@ -130,7 +142,7 @@ name = "crossbeam-epoch"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "arrayvec 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -164,25 +176,24 @@ dependencies = [
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.12.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper-rustls 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustyline 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
  "source-map-mappings 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-fs 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-fs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-process 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -199,21 +210,21 @@ dependencies = [
 
 [[package]]
 name = "failure"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "failure_derive"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -268,7 +279,7 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -278,9 +289,9 @@ dependencies = [
  "http 0.1.14 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "string 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -300,26 +311,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "hyper"
-version = "0.12.19"
+version = "0.12.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "h2 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "h2 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-tcp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.9 (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.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (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.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "want 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -332,11 +343,11 @@ dependencies = [
  "ct-logs 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.12.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-rustls 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-tcp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-rustls 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "webpki 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "webpki-roots 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -445,7 +456,7 @@ dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -506,7 +517,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -535,20 +546,20 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.6.4"
+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.3.1 (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_core"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.4 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -577,57 +588,39 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rand"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rand_chacha"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.3.0 (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 = "rand_core"
-version = "0.2.2"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -654,13 +647,14 @@ dependencies = [
 
 [[package]]
 name = "rand_os"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -675,7 +669,15 @@ dependencies = [
 
 [[package]]
 name = "rand_xorshift"
-version = "0.1.0"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rdrand"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -683,7 +685,7 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.1.44"
+version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -691,7 +693,7 @@ name = "redox_termios"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -700,9 +702,9 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -718,7 +720,7 @@ name = "ring"
 version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -726,7 +728,7 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.11"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -810,31 +812,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
-version = "1.0.82"
+version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde_json"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "signal-hook"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "arc-swap 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "slab"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -852,7 +854,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -861,7 +863,7 @@ name = "source-map-mappings"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "vlq 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -872,12 +874,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "string"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "syn"
-version = "0.15.23"
+version = "0.15.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -892,7 +894,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -903,8 +905,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
  "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -915,23 +917,23 @@ version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "time"
-version = "0.1.41"
+version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -940,15 +942,15 @@ dependencies = [
  "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-fs 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-tcp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-fs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (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.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-uds 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -958,7 +960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -967,30 +969,31 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-executor"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-fs"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-io"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1007,15 +1010,15 @@ dependencies = [
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-named-pipes 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-signal 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-reactor"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1024,19 +1027,20 @@ dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.1 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "webpki 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1049,38 +1053,39 @@ dependencies = [
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-tcp"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-threadpool"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1090,8 +1095,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.5 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1104,13 +1109,13 @@ dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (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.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-uds"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1121,8 +1126,8 @@ dependencies = [
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-uds 0.6.7 (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.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1268,29 +1273,30 @@ dependencies = [
 ]
 
 [metadata]
-"checksum arc-swap 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "5c5ed110e2537bdd3f5b9091707a8a5556a72ac49bbd7302ae0b28fdccb3246c"
+"checksum arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6"
 "checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392"
-"checksum arrayvec 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d18513977c2d8261c448511c5c53dc66b26dfccbc3d4446672dea1e71a7d8a26"
+"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
 "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
 "checksum autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e5f34df7a019573fb8bdc7e24a2bfebe51a2a1d6bfdbaeccedb3c41fc574727"
-"checksum backtrace 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "18b65ea1161bfb2dd6da6fade5edd4dbd08fba85012123dd333d2fd1b90b2782"
-"checksum backtrace-sys 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3fcce89e5ad5c8949caa9434501f7b55415b3e7ad5270cb88c75a8d35e8f1279"
+"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
+"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
 "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
 "checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
 "checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
 "checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
-"checksum cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "155ed195f7bd722d1dfeb30365b9d0c1f6a078fa7ca4014497e5935d90993d6f"
+"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
 "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
+"checksum crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "137bc235f622ffaa0428e3854e24acb53291fc0b3ff6fb2cb75a8be6fb02f06b"
 "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
 "checksum crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f10a4f8f409aaac4b16a5474fb233624238fcdeefb9ba50d5ea059aab63ba31c"
 "checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
 "checksum ct-logs 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "95a4bf5107667e12bf6ce31a3a5066d67acc88942b6742117a41198734aaccaa"
 "checksum dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "88972de891f6118092b643d85a0b28e0678e0f948d7f879aa32f2d5aafe97d2a"
-"checksum failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6dd377bcc1b1b7ce911967e3ec24fa19c3224394ec05b54aa7b083d498341ac7"
-"checksum failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "64c2d913fe8ed3b6c6518eedf4538255b989945c14c2a7d5cbff62a5e2120596"
+"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 flatbuffers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea0c34f669be9911826facafe996adfda978aeee67285a13556869e2d8b8331f"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
@@ -1298,10 +1304,10 @@ dependencies = [
 "checksum futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
 "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
 "checksum getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0a7292d30132fb5424b354f5dc02512a86e4c516fe544bb7a25e7f266951b797"
-"checksum h2 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "1ac030ae20dee464c5d0f36544d8b914a6bc606da44a57e052d2b0f5dae129e0"
+"checksum h2 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "30e0b8e55b4d7ffedade2b9605851f8e85f5010663e7ad170ef3c0f0681bc43f"
 "checksum http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "02096a6d2c55e63f7fcb800690e4f889a25f6ec342e3adb4594e293b625215ab"
 "checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83"
-"checksum hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)" = "f1ebec079129e43af5e234ef36ee3d7e6085687d145b7ea653b262d16c6b65f1"
+"checksum hyper 0.12.20 (registry+https://github.com/rust-lang/crates.io-index)" = "80eeda66c9ef8e18f5122fff2c54604c053420b11dae951cfb74cf1dcba2e93f"
 "checksum hyper-rustls 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "38ece6707d74e77f6bf723249757245c66236d4c600c1916c0bf9a84bcf288fd"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 "checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d"
@@ -1326,28 +1332,27 @@ dependencies = [
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
 "checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238"
 "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
-"checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"
-"checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c"
+"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
+"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
 "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
 "checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09"
 "checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
-"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
-"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
-"checksum rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b65e163105a6284f841bd23100a015895f54340e88a5ffc9ca7b8b33827cfce0"
-"checksum rand_chacha 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "771b009e3a508cb67e8823dda454aaa5368c7bc1c16829fb77d3e980440dd34a"
-"checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372"
+"checksum rand 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "dee497e66d8d76bf08ce20c8d36e16f93749ab0bf89975b4f8ae5cee660c2da2"
+"checksum rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3906503e80ac6cbcacb2c2973fa8e473f24d7e2747c8c92bb230c2441cad96b5"
+"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
 "checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db"
 "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
 "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-"checksum rand_os 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de5ac4de1c2973e1391dc305cb0fbf8788cb58068e98255439b7485a77022273"
+"checksum rand_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f46fbd5550acf75b0c2730f5dd1873751daf9beb8f11b44027778fae50d7feca"
 "checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05"
-"checksum rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effa3fcaa47e18db002bdde6060944b6d2f9cfd8db471c30e873448ad9187be3"
-"checksum redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)" = "a84bcd297b87a545980a2d25a0beb72a1f490c31f0a9fde52fca35bfbb1ceb70"
+"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+"checksum redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
 "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
 "checksum redox_users 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "214a97e49be64fd2c86f568dd0cb2c757d2cc53de95b273b6ad0a1c908482f26"
 "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
 "checksum ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2c4db68a2e35f3497146b7e4563df7d4773a2433230c5e4b448328e31740458a"
-"checksum rustc-demangle 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "01b90379b8664dd83460d59bdc5dd1fd3172b8913788db483ed1325171eab2f7"
+"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8b7891791343c75b73ed9a18cadcafd8c8563d11a88ebe2d87f5b8a3182654d9"
 "checksum rustyline 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6010155119d53aac4f5b987cb8f6ea913d0d64d9b237da36f8f96a90cb3f5385"
@@ -1358,35 +1363,35 @@ dependencies = [
 "checksum sct 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb8f61f9e6eadd062a71c380043d28036304a4706b3c4dd001ff3387ed00745a"
 "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 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)" = "6fa52f19aee12441d5ad11c9a00459122bd8f98707cadf9778c540674f1935b6"
-"checksum serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)" = "bdf540260cfee6da923831f4776ddc495ada940c30117977c70f1313a6130545"
-"checksum signal-hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8941ae94fa73d0f73b422774b3a40a7195cecd88d1c090f4b37ade7dc795ab66"
-"checksum slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5f9776d6b986f77b35c6cf846c11ad986ff128fe0b2b63a3628e3755e8d3102d"
+"checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
+"checksum serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "dfb1277d4d0563e4593e0b8b5d23d744d277b55d2bc0bf1c38d0d8a6589d38aa"
+"checksum signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1f272d1b7586bec132ed427f532dd418d8beca1ca7f2caf7df35569b1415a4b4"
+"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
 "checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7"
 "checksum source-map-mappings 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "89babfa6891f638e3e30c5dd248368937015b627a9704aaa8c9d3b9177bf8bfa"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
-"checksum string 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "98998cced76115b1da46f63388b909d118a37ae0be0f82ad35773d4a4bc9d18d"
-"checksum syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9545a6a093a3f0bd59adb472700acc08cad3776f860f16a897dfce8c88721cbc"
+"checksum string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b"
+"checksum syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)" = "734ecc29cd36e8123850d9bf21dfd62ef8300aaa8f879aabaa899721808be37c"
 "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2"
 "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
-"checksum time 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "847da467bf0db05882a9e2375934a8a55cffdc9db0d128af1518200260ba1f6c"
-"checksum tokio 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "a7817d4c98cc5be21360b3b37d6036fe9b7aefa5b7a201b7b16ff33423822f7d"
+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
+"checksum tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4790d0be6f4ba6ae4f48190efa2ed7780c9e3567796abdb285003cf39840d9c5"
 "checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
 "checksum tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "331c8acc267855ec06eb0c94618dcbbfea45bed2d20b77252940095273fb58f6"
-"checksum tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c117b6cf86bb730aab4834f10df96e4dd586eff2c3c27d3781348da49e255bde"
-"checksum tokio-fs 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "60ae25f6b17d25116d2cba342083abe5255d3c2c79cb21ea11aa049c53bf7c75"
-"checksum tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "7392fe0a70d5ce0c882c4778116c519bd5dbaa8a7c3ae3d04578b3afafdcda21"
+"checksum tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30c6dbf2d1ad1de300b393910e8a3aa272b724a400b6531da03eed99e329fbf0"
+"checksum tokio-fs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0e9cbbc8a3698b7ab652340f46633364f9eaa928ddaaee79d8b8f356dd79a09d"
+"checksum tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b53aeb9d3f5ccf2ebb29e19788f96987fa1355f8fe45ea193928eaaaf3ae820f"
 "checksum tokio-process 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "88e1281e412013f1ff5787def044a9577a0bed059f451e835f1643201f8b777d"
-"checksum tokio-reactor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "502b625acb4ee13cbb3b90b8ca80e0addd263ddacf6931666ef751e610b07fb5"
-"checksum tokio-rustls 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1c98c5346e4231382951111f42f4651094854462297370a08f0fba57a3b92576"
+"checksum tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "afbcdb0f0d2a1e4c440af82d7bbf0bf91a8a8c0575bcd20c05d15be7e9d3a02f"
+"checksum tokio-rustls 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04a5c8de3797c207c574495724eb77ded1a150160a2db0936c751bf49003c84e"
 "checksum tokio-signal 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "dd6dc5276ea05ce379a16de90083ec80836440d5ef8a6a39545a3207373b8296"
-"checksum tokio-tcp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7ad235e9dadd126b2d47f6736f65aa1fdcd6420e66ca63f44177bc78df89f912"
-"checksum tokio-threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "56c5556262383032878afad66943926a1d1f0967f17e94bd7764ceceb3b70e7f"
+"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
+"checksum tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "17465013014410310f9f61fa10bf4724803c149ea1d51efece131c38efca93aa"
 "checksum tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f37f0111d76cc5da132fe9bc0590b9b9cfd079bc7e75ac3846278430a299ff8"
 "checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
-"checksum tokio-uds 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "99ce87382f6c1a24b513a72c048b2c8efe66cb5161c9061d00bee510f08dc168"
+"checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
 "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
diff --git a/Cargo.toml b/Cargo.toml
index 794fa48610..430f980b2b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,31 +9,31 @@ name = "deno"
 version = "0.2.6"
 
 [dependencies]
-atty = "=0.2.11"
-dirs = "=1.0.4"
-flatbuffers = "=0.5.0"
-futures = "=0.1.25"
-getopts = "=0.2.18"
-http = "=0.1.14"
-hyper = "=0.12.19"
-hyper-rustls = "=0.15.0"
-lazy_static = "=1.2.0"
-libc = "=0.2.46"
-log = "=0.4.6"
-rand = "=0.6.3"
-remove_dir_all = "=0.5.1"
-ring = "=0.13.5"
-rustyline = "=2.1.0"
-serde_json = "1.0.34"
+atty = "0.2.11"
+dirs = "1.0.4"
+flatbuffers = "0.5.0"
+futures = "0.1.25"
+getopts = "0.2.18"
+http = "0.1.14"
+hyper = "0.12.20"
+hyper-rustls = "0.15.0"
+lazy_static = "1.2.0"
+libc = "0.2.46"
+log = "0.4.6"
+rand = "0.6.4"
+remove_dir_all = "0.5.1"
+ring = "0.13.5"
+rustyline = "2.1.0"
+serde_json = "1.0.35"
 source-map-mappings = "0.5.0"
-tempfile = "=3.0.5"
-tokio = "=0.1.13"
-tokio-executor = "=0.1.5"
-tokio-fs = "=0.1.4"
-tokio-io = "=0.1.10"
-tokio-process = "=0.2.3"
-tokio-threadpool = "=0.1.9"
-url = "=1.7.2"
+tempfile = "3.0.5"
+tokio = "0.1.14"
+tokio-executor = "0.1.6"
+tokio-fs = "0.1.5"
+tokio-io = "0.1.11"
+tokio-process = "0.2.3"
+tokio-threadpool = "0.1.10"
+url = "1.7.2"
 
 [target.'cfg(windows)'.dependencies]
-winapi = "=0.3.6"
+winapi = "0.3.6"
diff --git a/build_extra/rust/BUILD.gn b/build_extra/rust/BUILD.gn
index 4c20dd353b..7374dd7ed3 100644
--- a/build_extra/rust/BUILD.gn
+++ b/build_extra/rust/BUILD.gn
@@ -8,439 +8,108 @@
 
 import("rust.gni")
 
-crates = "//third_party/rust_crates"
-registry_github = "$crates/registry/src/github.com-1ecc6299db9ec823/"
+cargo_home = "//third_party/rust_crates"
 
-rust_crate("flatbuffers") {
-  source_root = "$registry_github/flatbuffers-0.5.0/src/lib.rs"
-  extern = [ ":smallvec" ]
-}
-
-rust_crate("nix") {
-  source_root = "$registry_github/nix-0.11.0/src/lib.rs"
-  extern = [
-    ":cfg_if",
-    ":libc",
-    ":void",
-    ":bitflags",
-  ]
-}
-
-rust_crate("rustyline") {
-  source_root = "$registry_github/rustyline-2.1.0/src/lib.rs"
-  extern = [
-    ":dirs",
-    ":libc",
-    ":log",
-    ":memchr",
-    ":nix",
-    ":unicode_segmentation",
-    ":unicode_width",
-    ":utf8parse",
-    ":winapi",
-  ]
-}
-
-rust_crate("bitflags") {
-  source_root = "$registry_github/bitflags-1.0.4/src/lib.rs"
-}
-
-rust_crate("unicode_segmentation") {
-  source_root = "$registry_github/unicode-segmentation-1.2.1/src/lib.rs"
-}
-
-rust_crate("memchr") {
-  source_root = "$registry_github/memchr-2.1.2/src/lib.rs"
-  extern = [
-    ":cfg_if",
-    ":libc",
-  ]
-}
-
-rust_crate("utf8parse") {
-  source_root = "$registry_github/utf8parse-0.1.1/src/lib.rs"
-}
-
-rust_crate("libc") {
-  source_root = "$registry_github/libc-0.2.46/src/lib.rs"
-  features = [ "use_std" ]
-}
-
-rust_crate("url") {
-  source_root = "$registry_github/url-1.7.2/src/lib.rs"
-  extern = [
-    ":matches",
-    ":idna",
-    ":percent_encoding",
-  ]
-}
-
-rust_crate("percent_encoding") {
-  source_root = "$registry_github/percent-encoding-1.0.1/lib.rs"
+rust_crate("arrayvec") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/arrayvec-0.4.10/src/lib.rs"
+  extern = [ ":nodrop" ]
   args = [
-    # TODO: Suppress some warnings at this moment
-    # This should be removed when it's fixed in servo/rust-url repository
-    # https://github.com/servo/rust-url/issues/455
-    "-Aunused-imports",
-    "-Adeprecated",
+    "--cap-lints",
+    "allow",
   ]
 }
 
-rust_crate("matches") {
-  source_root = "$registry_github/matches-0.1.8/lib.rs"
-}
-
-rust_crate("idna") {
-  source_root = "$registry_github/idna-0.1.5/src/lib.rs"
-  extern = [
-    ":matches",
-    ":unicode_bidi",
-    ":unicode_normalization",
+rust_crate("atty") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/atty-0.2.11/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
   ]
-}
-
-rust_crate("unicode_bidi") {
-  source_root = "$registry_github/unicode-bidi-0.3.4/src/lib.rs"
-  extern = [ ":matches" ]
-}
-
-rust_crate("unicode_normalization") {
-  source_root = "$registry_github/unicode-normalization-0.1.7/src/lib.rs"
-}
-
-rust_crate("log") {
-  source_root = "$registry_github/log-0.4.6/src/lib.rs"
-  extern = [ ":cfg_if" ]
-}
-
-rust_crate("cfg_if") {
-  source_root = "$registry_github/cfg-if-0.1.6/src/lib.rs"
-}
-
-rust_crate("tempfile") {
-  source_root = "$registry_github/tempfile-3.0.5/src/lib.rs"
-  extern = [
-    ":cfg_if",
-    ":libc",
-    ":rand",
-    ":remove_dir_all",
-    ":winapi",
-  ]
-}
-
-rust_crate("rand") {
-  source_root = "$registry_github/rand-0.6.3/src/lib.rs"
-  features = [
-    "std",
-    "alloc",
-    "rand_os",
-  ]
-  extern = [
-    ":libc",
-    ":winapi",
-    ":rand_core",
-    ":rand_isaac",
-    ":rand_hc",
-    ":rand_os",
-    ":rand_chacha",
-    ":rand_pcg",
-    ":rand_xorshift",
-  ]
-}
-
-rust_crate("rand_os") {
-  source_root = "$registry_github/rand_os-0.1.0/src/lib.rs"
-  extern = [
-    ":rand_core",
-    ":libc",
-    ":log",
-    ":winapi",
-  ]
-}
-
-rust_crate("rand_hc") {
-  source_root = "$registry_github/rand_hc-0.1.0/src/lib.rs"
-  extern = [ ":rand_core" ]
-}
-
-rust_crate("rand_xorshift") {
-  source_root = "$registry_github/rand_xorshift-0.1.0/src/lib.rs"
-  extern = [ ":rand_core" ]
-}
-
-rust_crate("rand_pcg") {
-  source_root = "$registry_github/rand_pcg-0.1.1/src/lib.rs"
-  extern = [ ":rand_core" ]
-}
-
-rust_crate("rand_isaac") {
-  source_root = "$registry_github/rand_isaac-0.1.1/src/lib.rs"
-  extern = [ ":rand_core" ]
-}
-
-rust_crate("rand_chacha") {
-  source_root = "$registry_github/rand_chacha-0.1.0/src/lib.rs"
-  extern = [ ":rand_core" ]
-}
-
-rust_crate("rand_core") {
-  source_root = "$registry_github/rand_core-0.3.0/src/lib.rs"
-  features = [
-    "std",
-    "alloc",
-  ]
-  if (is_mac) {
-    libs = [ "Security.framework" ]
+  if (is_posix) {
+    extern = [ ":libc" ]
+  }
+  if (is_win) {
+    extern = [ ":winapi" ]
   }
 }
 
-rust_crate("remove_dir_all") {
-  source_root = "$registry_github/remove_dir_all-0.5.1/src/lib.rs"
-  extern = [ ":winapi" ]
-}
-
-rust_crate("winapi") {
-  source_root = "$registry_github/winapi-0.3.6/src/lib.rs"
-  features = [
-    "basetsd",
-    "cfg",
-    "cfgmgr32",
-    "combaseapi",
-    "consoleapi",
-    "errhandlingapi",
-    "excpt",
-    "fileapi",
-    "guiddef",
-    "handleapi",
-    "in6addr",
-    "inaddr",
-    "ioapiset",
-    "knownfolders",
-    "ktmtypes",
-    "libloaderapi",
-    "limits",
-    "lsalookup",
-    "minwinbase",
-    "minwindef",
-    "mstcpip",
-    "namedpipeapi",
-    "ntdef",
-    "ntsecapi",
-    "ntstatus",
-    "objbase",
-    "objidl",
-    "objidlbase",
-    "processenv",
-    "processthreadsapi",
-    "profileapi",
-    "propidl",
-    "qos",
-    "rpc",
-    "rpcdce",
-    "rpcndr",
-    "shlobj",
-    "shtypes",
-    "sspi",
-    "std",
-    "subauth",
-    "synchapi",
-    "sysinfoapi",
-    "threadpoollegacyapiset",
-    "timezoneapi",
-    "unknwnbase",
-    "vadefs",
-    "vcruntime",
-    "winbase",
-    "wincon",
-    "wincred",
-    "windef",
-    "winerror",
-    "wingdi",
-    "winnt",
-    "winreg",
-    "winsock2",
-    "winuser",
-    "ws2def",
-    "ws2ipdef",
-    "ws2tcpip",
-    "wtypes",
-    "wtypesbase",
-  ]
-}
-
-# Old version of the 'winapi' crate, required by 'mio', 'miow', and 'iovec'.
-# This exceptional! Generally we don't allow multiple versions of a crate.
-# TODO: Remove this dependency. https://github.com/denoland/deno/issues/484
-rust_crate("winapi-0.2") {
-  crate_name = "winapi"
-  crate_version = "0.2"
-  source_root = "$registry_github/winapi-0.2.8/src/lib.rs"
-  args = [
-    "-Asafe_packed_borrows",
-    "-Awarnings",
-  ]
-
-  # The winapi-0.2 crate contains an unused type alias, but it also specifically
-  # sets the lint level to warn about this, so we can't suppress that warning
-  # with a command line argument, other than by using "-Awarnings", which has no
-  # effect if we also pass "-Dwarnings" to treat all warnings as errors.
-  # Since this crate is outdated and this will never be fixed, just override
-  # the global 'rust_treat_warnings_as_errors' setting for this crate.
-  treat_warnings_as_errors = false
-}
-
-# TODO: Remove this crate together with crate 'winapi-0.2'.
-rust_crate("kernel32") {
-  source_root = "$registry_github/kernel32-sys-0.2.2/src/lib.rs"
-  extern_version = [
-    {
-      crate_name = "winapi"
-      crate_version = "0.2"
-    },
-  ]
-}
-
-# TODO: Remove this crate together with crate 'winapi-0.2'.
-rust_crate("ws2_32") {
-  source_root = "$registry_github/ws2_32-sys-0.2.1/src/lib.rs"
-  extern_version = [
-    {
-      crate_name = "winapi"
-      crate_version = "0.2"
-    },
-  ]
-}
-
-rust_crate("futures") {
-  source_root = "$registry_github/futures-0.1.25/src/lib.rs"
-  features = [
-    "use_std",
-    "with-deprecated",
-  ]
-}
-
-# TODO: 'mio' currently pulls in dozen of outdated winapi related dependencies.
-# 'miow' has already moved beyond that, and 'mio' itself has been upgraded on
-# the v0.7 branch some time ago. However there are no signs that version 0.7 is
-# going to be released any time soon. We should consider floating these patches.
-rust_crate("mio") {
-  source_root = "$registry_github/mio-0.6.16/src/lib.rs"
-  features = [
-    "default",
-    "with-deprecated",
-  ]
-  extern = [
-    ":iovec",
-    ":kernel32",
-    ":lazycell",
-    ":libc",
-    ":log",
-    ":net2",
-    ":slab",
-  ]
-  extern_version = [
-    {
-      crate_name = "miow"
-      crate_version = "0.2"
-    },
-    {
-      crate_name = "winapi"
-      crate_version = "0.2"
-    },
-  ]
-}
-
-rust_crate("mio_uds") {
-  source_root = "$registry_github/mio-uds-0.6.7/src/lib.rs"
-  extern = [
-    ":iovec",
-    ":libc",
-    ":mio",
-  ]
-}
-
-# Outdated version of 'miow' - see comments by the 'mio' crate.
-rust_crate("miow-0.2") {
-  crate_name = "miow"
-  crate_version = "0.2"
-  source_root = "$registry_github/miow-0.2.1/src/lib.rs"
-  extern = [
-    ":kernel32",
-    ":net2",
-    ":ws2_32",
-  ]
-  extern_version = [
-    {
-      crate_name = "winapi"
-      crate_version = "0.2"
-    },
-  ]
-  args = [ "-Aunused_macros" ]  # Unused macro `t` in lib.rs:21.
-}
-
-rust_crate("iovec") {
-  source_root = "$registry_github/iovec-0.1.2/src/lib.rs"
-  extern = [ ":libc" ]
-
-  # TODO: Upgrade to a current version of the 'winapi' crate.
-  # See https://github.com/denoland/deno/issues/484.
-  extern_version = [
-    {
-      crate_name = "winapi"
-      crate_version = "0.2"
-    },
-  ]
-}
-
-rust_crate("lazycell") {
-  source_root = "$registry_github/lazycell-1.2.1/src/lib.rs"
-}
-
-rust_crate("net2") {
-  source_root = "$registry_github/net2-0.2.33/src/lib.rs"
-  features = [
-    "default",
-    "duration",
-  ]
-  extern = [
-    ":cfg_if",
-    ":libc",
-    ":winapi",
-  ]
-}
-
-rust_crate("slab") {
-  source_root = "$registry_github/slab-0.4.1/src/lib.rs"
-}
-
-rust_crate("bytes") {
-  source_root = "$registry_github/bytes-0.4.11/src/lib.rs"
+rust_crate("base64") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/base64-0.9.3/src/lib.rs"
   extern = [
     ":byteorder",
-    ":iovec",
+    ":safemem",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
   ]
 }
 
 rust_crate("byteorder") {
-  source_root = "$registry_github/byteorder-1.2.7/src/lib.rs"
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/byteorder-1.2.7/src/lib.rs"
+  features = [
+    "default",
+    "std",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("bytes") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/bytes-0.4.11/src/lib.rs"
+  extern = [
+    ":byteorder",
+    ":iovec",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("cfg_if") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/cfg-if-0.1.6/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("crossbeam_channel") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/crossbeam-channel-0.3.6/src/lib.rs"
+  extern = [
+    ":crossbeam_utils",
+    ":parking_lot",
+    ":rand",
+    ":smallvec",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
 }
 
 rust_crate("crossbeam_deque") {
-  source_root = "$registry_github/crossbeam-deque-0.6.3/src/lib.rs"
-  features = [ "std" ]
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/crossbeam-deque-0.6.3/src/lib.rs"
   extern = [
     ":crossbeam_epoch",
     ":crossbeam_utils",
   ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
 }
 
 rust_crate("crossbeam_epoch") {
-  source_root = "$registry_github/crossbeam-epoch-0.7.0/src/lib.rs"
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/crossbeam-epoch-0.7.0/src/lib.rs"
   features = [
-    "std",
-    "lazy_static",
-    "default",
     "crossbeam-utils",
+    "default",
+    "lazy_static",
+    "std",
   ]
   extern = [
     ":arrayvec",
@@ -450,54 +119,168 @@ rust_crate("crossbeam_epoch") {
     ":memoffset",
     ":scopeguard",
   ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
 }
 
 rust_crate("crossbeam_utils") {
-  source_root = "$registry_github/crossbeam-utils-0.6.3/src/lib.rs"
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/crossbeam-utils-0.6.3/src/lib.rs"
   features = [
-    "std",
     "default",
+    "std",
+  ]
+  extern = [ ":cfg_if" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("ct_logs") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ct-logs-0.4.0/src/lib.rs"
+  extern = [ ":sct" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("dirs") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/dirs-1.0.4/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+  if (is_posix) {
+    extern = [ ":libc" ]
+  }
+  if (is_win) {
+    extern = [ ":winapi" ]
+  }
+}
+
+rust_crate("flatbuffers") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/flatbuffers-0.5.0/src/lib.rs"
+  extern = [ ":smallvec" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("fnv") {
+  source_root =
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/fnv-1.0.6/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("futures") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/futures-0.1.25/src/lib.rs"
+  features = [
+    "default",
+    "use_std",
+    "with-deprecated",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("futures_cpupool") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/futures-cpupool-0.1.8/src/lib.rs"
+  features = [
+    "default",
+    "futures",
+    "with-deprecated",
   ]
   extern = [
-    ":cfg_if",
-    ":memoffset",
+    ":futures",
+    ":num_cpus",
   ]
-}
-
-rust_crate("arrayvec") {
-  source_root = "$registry_github/arrayvec-0.4.9/src/lib.rs"
-  extern = [ ":nodrop" ]
-}
-
-rust_crate("nodrop") {
-  source_root = "$registry_github/nodrop-0.1.13/src/lib.rs"
-}
-
-rust_crate("lazy_static") {
-  source_root = "$registry_github/lazy_static-1.2.0/src/lib.rs"
   args = [
-    "--cfg",
-    "lazy_static_inline_impl",
+    "--cap-lints",
+    "allow",
   ]
 }
 
-rust_crate("memoffset") {
-  source_root = "$registry_github/memoffset-0.2.1/src/lib.rs"
+rust_crate("getopts") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/getopts-0.2.18/src/lib.rs"
+  extern = [ ":unicode_width" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
 }
 
-rust_crate("scopeguard") {
-  source_root = "$registry_github/scopeguard-0.3.3/src/lib.rs"
-  features = [ "use_std" ]
+rust_crate("h2") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/h2-0.1.15/src/lib.rs"
+  extern = [
+    ":byteorder",
+    ":bytes",
+    ":fnv",
+    ":futures",
+    ":http",
+    ":indexmap",
+    ":log",
+    ":slab",
+    ":string",
+    ":tokio_io",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
 }
 
-rust_crate("num_cpus") {
-  source_root = "$registry_github/num_cpus-1.9.0/src/lib.rs"
-  extern = [ ":libc" ]
+rust_crate("http") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/http-0.1.14/src/lib.rs"
+  extern = [
+    ":bytes",
+    ":fnv",
+    ":itoa",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("httparse") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/httparse-1.3.3/src/lib.rs"
+  features = [
+    "default",
+    "std",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+
+  # Added by custom-build script.
+  cfg = [ "httparse_simd" ]
 }
 
 rust_crate("hyper") {
-  source_root = "$registry_github/hyper-0.12.19/src/lib.rs"
-  features = [ "runtime" ]
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/hyper-0.12.20/src/lib.rs"
+  features = [
+    "__internal_flaky_tests",
+    "default",
+    "futures-cpupool",
+    "net2",
+    "runtime",
+    "tokio",
+    "tokio-executor",
+    "tokio-reactor",
+    "tokio-tcp",
+    "tokio-threadpool",
+    "tokio-timer",
+  ]
   extern = [
     ":bytes",
     ":futures",
@@ -519,229 +302,14 @@ rust_crate("hyper") {
     ":tokio_timer",
     ":want",
   ]
-}
-
-rust_crate("h2") {
-  source_root = "$registry_github/h2-0.1.14/src/lib.rs"
-  extern = [
-    ":byteorder",
-    ":bytes",
-    ":fnv",
-    ":futures",
-    ":http",
-    ":indexmap",
-    ":log",
-    ":slab",
-    ":string",
-    ":tokio_io",
-  ]
-}
-
-rust_crate("http") {
-  source_root = "$registry_github/http-0.1.14/src/lib.rs"
-  extern = [
-    ":bytes",
-    ":fnv",
-    ":itoa",
-  ]
-}
-
-rust_crate("httparse") {
-  source_root = "$registry_github/httparse-1.3.3/src/lib.rs"
-}
-
-rust_crate("fnv") {
-  source_root = "$registry_github/fnv-1.0.6/lib.rs"
-}
-
-rust_crate("futures_cpupool") {
-  source_root = "$registry_github/futures-cpupool-0.1.8/src/lib.rs"
-  extern = [
-    ":futures",
-    ":num_cpus",
-  ]
-  args = [ "-Adeprecated" ]  # futures::Run
-}
-
-rust_crate("indexmap") {
-  source_root = "$registry_github/indexmap-1.0.2/src/lib.rs"
-}
-
-rust_crate("itoa") {
-  source_root = "$registry_github/itoa-0.4.3/src/lib.rs"
-  features = [ "std" ]
-}
-
-rust_crate("string") {
-  source_root = "$registry_github/string-0.1.2/src/lib.rs"
-}
-
-rust_crate("time") {
-  source_root = "$registry_github/time-0.1.41/src/lib.rs"
-  extern = [
-    ":libc",
-    ":winapi",
-  ]
-}
-
-rust_crate("try_lock") {
-  source_root = "$registry_github/try-lock-0.2.2/src/lib.rs"
-}
-
-rust_crate("want") {
-  source_root = "$registry_github/want-0.0.6/src/lib.rs"
-  extern = [
-    ":futures",
-    ":try_lock",
-    ":log",
-  ]
-}
-
-rust_crate("tokio") {
-  source_root = "$registry_github/tokio-0.1.13/src/lib.rs"
-  extern = [
-    ":futures",
-    ":mio",
-    ":bytes",
-    ":tokio_codec",
-    ":tokio_executor",
-    ":tokio_fs",
-    ":tokio_io",
-    ":tokio_reactor",
-    ":tokio_tcp",
-    ":tokio_threadpool",
-    ":tokio_current_thread",
-    ":tokio_timer",
-    ":tokio_udp",
-    ":tokio_uds",
-    ":num_cpus",
-  ]
-}
-
-rust_crate("tokio_executor") {
-  source_root = "$registry_github/tokio-executor-0.1.5/src/lib.rs"
-  extern = [ ":futures" ]
-}
-
-rust_crate("tokio_fs") {
-  source_root = "$registry_github/tokio-fs-0.1.4/src/lib.rs"
-  extern = [
-    ":futures",
-    ":tokio_io",
-    ":tokio_threadpool",
-  ]
-}
-
-rust_crate("tokio_io") {
-  source_root = "$registry_github/tokio-io-0.1.10/src/lib.rs"
-  extern = [
-    ":bytes",
-    ":futures",
-    ":log",
-  ]
-}
-
-rust_crate("tokio_timer") {
-  source_root = "$registry_github/tokio-timer-0.2.8/src/lib.rs"
-  extern = [
-    ":futures",
-    ":tokio_executor",
-    ":slab",
-    ":crossbeam_utils",
-  ]
-}
-
-rust_crate("tokio_udp") {
-  source_root = "$registry_github/tokio-udp-0.1.3/src/lib.rs"
-  extern = [
-    ":bytes",
-    ":futures",
-    ":log",
-    ":mio",
-    ":tokio_codec",
-    ":tokio_io",
-    ":tokio_reactor",
-  ]
-}
-
-rust_crate("tokio_uds") {
-  source_root = "$registry_github/tokio-uds-0.2.4/src/lib.rs"
-  extern = [
-    ":bytes",
-    ":futures",
-    ":iovec",
-    ":libc",
-    ":log",
-    ":mio",
-    ":mio_uds",
-    ":tokio_reactor",
-    ":tokio_io",
-    ":tokio_codec",
-    ":tokio_reactor",
-  ]
-}
-
-rust_crate("tokio_codec") {
-  source_root = "$registry_github/tokio-codec-0.1.1/src/lib.rs"
-  extern = [
-    ":bytes",
-    ":futures",
-    ":tokio_io",
-  ]
-}
-
-rust_crate("tokio_reactor") {
-  source_root = "$registry_github/tokio-reactor-0.1.7/src/lib.rs"
-  extern = [
-    ":crossbeam_utils",
-    ":futures",
-    ":lazy_static",
-    ":log",
-    ":mio",
-    ":num_cpus",
-    ":parking_lot",
-    ":slab",
-    ":tokio_executor",
-    ":tokio_io",
-    ":tokio_io",
-  ]
-}
-
-rust_crate("tokio_tcp") {
-  source_root = "$registry_github/tokio-tcp-0.1.2/src/lib.rs"
-  extern = [
-    ":bytes",
-    ":futures",
-    ":iovec",
-    ":mio",
-    ":tokio_io",
-    ":tokio_reactor",
-  ]
-}
-
-rust_crate("tokio_threadpool") {
-  source_root = "$registry_github/tokio-threadpool-0.1.9/src/lib.rs"
-  extern = [
-    ":crossbeam_deque",
-    ":crossbeam_utils",
-    ":futures",
-    ":log",
-    ":num_cpus",
-    ":rand",
-    ":tokio_executor",
-  ]
-}
-
-rust_crate("tokio_current_thread") {
-  source_root = "$registry_github/tokio-current-thread-0.1.4/src/lib.rs"
-  extern = [
-    ":futures",
-    ":tokio_executor",
+  args = [
+    "--cap-lints",
+    "allow",
   ]
 }
 
 rust_crate("hyper_rustls") {
-  source_root = "$registry_github/hyper-rustls-0.15.0/src/lib.rs"
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/hyper-rustls-0.15.0/src/lib.rs"
   extern = [
     ":ct_logs",
     ":futures",
@@ -754,189 +322,1122 @@ rust_crate("hyper_rustls") {
     ":webpki",
     ":webpki_roots",
   ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
 }
 
-rust_crate("dirs") {
-  source_root = "$registry_github/dirs-1.0.4/src/lib.rs"
+rust_crate("idna") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/idna-0.1.5/src/lib.rs"
   extern = [
-    ":libc",
-    ":winapi",
+    ":matches",
+    ":unicode_bidi",
+    ":unicode_normalization",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
   ]
 }
 
-ring_root = "$registry_github/ring-0.13.5/"
-
-static_library("ring_primitives") {
-  sources = [
-    "$ring_root/crypto/constant_time_test.c",
-    "$ring_root/crypto/cpu-aarch64-linux.c",
-    "$ring_root/crypto/cpu-arm-linux.c",
-    "$ring_root/crypto/cpu-arm.c",
-    "$ring_root/crypto/cpu-intel.c",
-    "$ring_root/crypto/crypto.c",
-    "$ring_root/crypto/fipsmodule/aes/aes.c",
-    "$ring_root/crypto/fipsmodule/aes/internal.h",
-    "$ring_root/crypto/fipsmodule/bn/exponentiation.c",
-    "$ring_root/crypto/fipsmodule/bn/generic.c",
-    "$ring_root/crypto/fipsmodule/bn/internal.h",
-    "$ring_root/crypto/fipsmodule/bn/montgomery.c",
-    "$ring_root/crypto/fipsmodule/bn/montgomery_inv.c",
-    "$ring_root/crypto/fipsmodule/bn/shift.c",
-    "$ring_root/crypto/fipsmodule/cipher/e_aes.c",
-    "$ring_root/crypto/fipsmodule/cipher/internal.h",
-    "$ring_root/crypto/fipsmodule/ec",
-    "$ring_root/crypto/fipsmodule/ec/ecp_nistz.c",
-    "$ring_root/crypto/fipsmodule/ec/ecp_nistz.h",
-    "$ring_root/crypto/fipsmodule/ec/ecp_nistz256.c",
-    "$ring_root/crypto/fipsmodule/ec/ecp_nistz256.h",
-    "$ring_root/crypto/fipsmodule/ec/ecp_nistz384.h",
-    "$ring_root/crypto/fipsmodule/ec/gfp_p256.c",
-    "$ring_root/crypto/fipsmodule/ec/gfp_p384.c",
-    "$ring_root/crypto/fipsmodule/modes/gcm.c",
-    "$ring_root/crypto/fipsmodule/modes/internal.h",
-    "$ring_root/crypto/internal.h",
-    "$ring_root/crypto/limbs/limbs.c",
-    "$ring_root/crypto/limbs/limbs.h",
-    "$ring_root/crypto/mem.c",
-    "$ring_root/include/GFp/aes.h",
-    "$ring_root/include/GFp/arm_arch.h",
-    "$ring_root/include/GFp/base.h",
-    "$ring_root/include/GFp/cpu.h",
-    "$ring_root/include/GFp/mem.h",
-    "$ring_root/include/GFp/type_check.h",
-    "$ring_root/third_party/fiat/curve25519.c",
-    "$ring_root/third_party/fiat/curve25519_tables.h",
-    "$ring_root/third_party/fiat/internal.h",
-
-    #"$ring_root/crypto/fipsmodule/modes/polyval.c",
+rust_crate("indexmap") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/indexmap-1.0.2/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
   ]
-  if (is_mac) {
-    sources += [
-      "$ring_root/pregenerated/aes-586-macosx.S",
-      "$ring_root/pregenerated/aes-x86_64-macosx.S",
-      "$ring_root/pregenerated/aesni-gcm-x86_64-macosx.S",
-      "$ring_root/pregenerated/aesni-x86-macosx.S",
-      "$ring_root/pregenerated/aesni-x86_64-macosx.S",
-      "$ring_root/pregenerated/chacha-x86-macosx.S",
-      "$ring_root/pregenerated/chacha-x86_64-macosx.S",
-      "$ring_root/pregenerated/ecp_nistz256-x86-macosx.S",
-      "$ring_root/pregenerated/ghash-x86-macosx.S",
-      "$ring_root/pregenerated/ghash-x86_64-macosx.S",
-      "$ring_root/pregenerated/p256-x86_64-asm-macosx.S",
-      "$ring_root/pregenerated/poly1305-x86-macosx.S",
-      "$ring_root/pregenerated/poly1305-x86_64-macosx.S",
-      "$ring_root/pregenerated/sha256-586-macosx.S",
-      "$ring_root/pregenerated/sha256-x86_64-macosx.S",
-      "$ring_root/pregenerated/sha512-586-macosx.S",
-      "$ring_root/pregenerated/sha512-x86_64-macosx.S",
-      "$ring_root/pregenerated/vpaes-x86-macosx.S",
-      "$ring_root/pregenerated/vpaes-x86_64-macosx.S",
-      "$ring_root/pregenerated/x86-mont-macosx.S",
-      "$ring_root/pregenerated/x86_64-mont-macosx.S",
-      "$ring_root/pregenerated/x86_64-mont5-macosx.S",
-    ]
-  }
-  if (is_linux) {
-    sources += [
-      "$ring_root/pregenerated/aes-x86_64-elf.S",
-      "$ring_root/pregenerated/aesni-gcm-x86_64-elf.S",
-      "$ring_root/pregenerated/aesni-x86_64-elf.S",
-      "$ring_root/pregenerated/aesv8-armx-linux64.S",
-      "$ring_root/pregenerated/chacha-x86_64-elf.S",
-      "$ring_root/pregenerated/ghash-x86_64-elf.S",
-      "$ring_root/pregenerated/ghashv8-armx-linux64.S",
-      "$ring_root/pregenerated/p256-x86_64-asm-elf.S",
-      "$ring_root/pregenerated/poly1305-x86_64-elf.S",
-      "$ring_root/pregenerated/sha256-x86_64-elf.S",
-      "$ring_root/pregenerated/sha512-x86_64-elf.S",
-      "$ring_root/pregenerated/vpaes-x86_64-elf.S",
-      "$ring_root/pregenerated/x86_64-mont-elf.S",
-      "$ring_root/pregenerated/x86_64-mont5-elf.S",
-    ]
+}
 
-    # Disable warning: '_GNU_SOURCE' macro redefined
-    cflags = [ "-Wno-macro-redefined" ]
+rust_crate("iovec") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/iovec-0.1.2/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+  if (is_posix) {
+    extern = [ ":libc" ]
   }
   if (is_win) {
-    libs = [
-      "$ring_root/pregenerated/aes-x86_64-nasm.obj",
-      "$ring_root/pregenerated/aesni-gcm-x86_64-nasm.obj",
-      "$ring_root/pregenerated/aesni-x86_64-nasm.obj",
-      "$ring_root/pregenerated/chacha-x86_64-nasm.obj",
-      "$ring_root/pregenerated/ghash-x86_64-nasm.obj",
-      "$ring_root/pregenerated/p256-x86_64-asm-nasm.obj",
-      "$ring_root/pregenerated/poly1305-x86_64-nasm.obj",
-      "$ring_root/pregenerated/sha256-x86_64-nasm.obj",
-      "$ring_root/pregenerated/sha512-x86_64-nasm.obj",
-      "$ring_root/pregenerated/vpaes-x86_64-nasm.obj",
-      "$ring_root/pregenerated/x86_64-mont-nasm.obj",
-      "$ring_root/pregenerated/x86_64-mont5-nasm.obj",
+    extern_version = [
+      {
+        crate_name = "winapi"
+        crate_version = "0.2.8"
+      },
     ]
-
-    # Disable warning: '_addcarry_u64' is not a recognized builtin
-    cflags = [ "-Wno-ignored-pragma-intrinsic" ]
   }
-  include_dirs = [ "$ring_root/include/" ]
+}
+
+rust_crate("itoa") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/itoa-0.4.3/src/lib.rs"
+  features = [
+    "default",
+    "std",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("lazy_static") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/lazy_static-1.2.0/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("lazycell") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/lazycell-1.2.1/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("libc") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/libc-0.2.46/src/lib.rs"
+  features = [
+    "default",
+    "use_std",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+
+  # Added by custom-build script.
+  cfg = [ "core_cvoid" ]
+}
+
+rust_crate("lock_api") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/lock_api-0.1.5/src/lib.rs"
+  extern = [
+    ":scopeguard",
+    ## Override: avoid dependency on on 'owning_ref'.
+    # ":owning_ref",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+
+  ## Override: avoid dependency on on 'owning_ref'.
+  # features = [ "owning_ref" ]
+}
+
+rust_crate("log") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/log-0.4.6/src/lib.rs"
+  extern = [ ":cfg_if" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("matches") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/matches-0.1.8/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("memchr") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/memchr-2.1.2/src/lib.rs"
+  features = [
+    "default",
+    "libc",
+    "use_std",
+  ]
+  extern = [
+    ":cfg_if",
+    ":libc",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+
+  # Added by custom-build script.
+  cfg = [
+    "memchr_runtime_avx",
+    "memchr_runtime_simd",
+    "memchr_runtime_sse2",
+    "memchr_runtime_sse42",
+  ]
+}
+
+rust_crate("memoffset") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/memoffset-0.2.1/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("mio") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/mio-0.6.16/src/lib.rs"
+  features = [
+    "default",
+    "with-deprecated",
+  ]
+  extern = [
+    ":iovec",
+    ":lazycell",
+    ":log",
+    ":net2",
+    ":slab",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+  if (is_posix) {
+    extern += [ ":libc" ]
+  }
+  if (is_win) {
+    extern += [ ":kernel32" ]
+    extern_version = [
+      {
+        crate_name = "miow"
+        crate_version = "0.2.1"
+      },
+      {
+        crate_name = "winapi"
+        crate_version = "0.2.8"
+      },
+    ]
+  }
+}
+
+rust_crate("net2") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/net2-0.2.33/src/lib.rs"
+  features = [
+    "default",
+    "duration",
+  ]
+  extern = [ ":cfg_if" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+  if (is_posix) {
+    extern += [ ":libc" ]
+  }
+  if (is_win) {
+    extern += [ ":winapi" ]
+  }
+}
+
+rust_crate("nodrop") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/nodrop-0.1.13/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("num_cpus") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/num_cpus-1.9.0/src/lib.rs"
+  extern = [ ":libc" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+## Override: avoid dependency on on 'owning_ref'.
+# rust_crate("owning_ref") {
+#   source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/owning_ref-0.4.0/src/lib.rs"
+#   extern = [ ":stable_deref_trait" ]
+#   args = [
+#     "--cap-lints",
+#     "allow",
+#   ]
+# }
+
+rust_crate("parking_lot") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/parking_lot-0.7.1/src/lib.rs"
+  features = [
+    "default",
+    "lock_api",
+
+    ## Override: avoid dependency on on 'owning_ref'.
+    # "owning_ref",
+  ]
+  extern = [
+    ":lock_api",
+    ":parking_lot_core",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("parking_lot_core") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/parking_lot_core-0.4.0/src/lib.rs"
+  extern = [
+    ":rand",
+    ":smallvec",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+
+  # Added by custom-build script.
+  cfg = [ "has_localkey_try_with" ]
+  if (is_posix) {
+    extern += [ ":libc" ]
+  }
+  if (is_win) {
+    extern += [ ":winapi" ]
+  }
+}
+
+rust_crate("percent_encoding") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/percent-encoding-1.0.1/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("rand") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand-0.6.4/src/lib.rs"
+  features = [
+    "alloc",
+    "default",
+    "rand_core",
+    "rand_os",
+    "std",
+  ]
+  extern = [
+    ":rand_chacha",
+    ":rand_core",
+    ":rand_hc",
+    ":rand_isaac",
+    ":rand_os",
+    ":rand_pcg",
+    ":rand_xorshift",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+
+  # Added by custom-build script.
+  cfg = [
+    "rustc_1_25",
+    "rustc_1_26",
+    "rustc_1_27",
+  ]
+  if (is_posix) {
+    extern += [ ":libc" ]
+  }
+  if (is_win) {
+    extern += [ ":winapi" ]
+  }
+}
+
+rust_crate("rand_chacha") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_chacha-0.1.1/src/lib.rs"
+  extern = [ ":rand_core" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+
+  # Added by custom-build script.
+  cfg = [ "rustc_1_26" ]
+}
+
+rust_crate("rand_core") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_core-0.3.0/src/lib.rs"
+  features = [
+    "alloc",
+    "std",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("rand_hc") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_hc-0.1.0/src/lib.rs"
+  extern = [ ":rand_core" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("rand_isaac") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_isaac-0.1.1/src/lib.rs"
+  extern = [ ":rand_core" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("rand_os") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_os-0.1.1/src/lib.rs"
+  extern = [ ":rand_core" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+  if (is_posix) {
+    extern += [ ":libc" ]
+  }
+
+  # Per the #[link(...)] attribute found in 'src/macos.rs'.
+  if (is_mac) {
+    libs = [ "Security.framework" ]
+  }
+  if (is_win) {
+    extern += [ ":winapi" ]
+  }
+}
+
+rust_crate("rand_pcg") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_pcg-0.1.1/src/lib.rs"
+  extern = [ ":rand_core" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+
+  # Added by custom-build script.
+  cfg = [ "rust_1_26" ]
+}
+
+rust_crate("rand_xorshift") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_xorshift-0.1.1/src/lib.rs"
+  extern = [ ":rand_core" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("remove_dir_all") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/remove_dir_all-0.5.1/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+  if (is_win) {
+    extern = [ ":winapi" ]
+  }
 }
 
 rust_crate("ring") {
-  source_root = "$ring_root/src/lib.rs"
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/src/lib.rs"
   features = [
-    "use_heap",
+    "default",
+    "dev_urandom_fallback",
     "rsa_signing",
-  ]
-  extern = [
-    ":libc",
-    ":untrusted",
-    ":lazy_static",
+    "use_heap",
   ]
   deps = [
-    ":ring_primitives",
+    ":ring-core",
+    ## Override: don't build 'ring-test' static library.
+    # ":ring-test",
   ]
+  extern = [ ":untrusted" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+  if (is_linux) {
+    extern += [
+      ":lazy_static",
+      ":libc",
+    ]
+  }
+
+  # Per the #[link(...)] attribute found in 'src/rand.rs'.
+  if (is_mac) {
+    libs = [ "Security.framework" ]
+  }
+
+  # Per the #[link(...)] attribute found in 'src/rand.rs'.
+  if (is_win) {
+    libs = [ "advapi32.lib" ]
+  }
 }
 
+static_library("ring-core") {
+  include_dirs = [
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/include",
+  ]
+  sources = [
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/cpu-intel.c",
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/crypto.c",
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/fipsmodule/aes/aes.c",
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/fipsmodule/bn/exponentiation.c",
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/fipsmodule/bn/generic.c",
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/fipsmodule/bn/montgomery.c",
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/fipsmodule/bn/montgomery_inv.c",
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/fipsmodule/bn/shift.c",
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/fipsmodule/cipher/e_aes.c",
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/fipsmodule/ec/ecp_nistz.c",
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/fipsmodule/ec/ecp_nistz256.c",
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/fipsmodule/ec/gfp_p256.c",
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/fipsmodule/ec/gfp_p384.c",
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/fipsmodule/modes/gcm.c",
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/limbs/limbs.c",
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/mem.c",
+    "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/third_party/fiat/curve25519.c",
+  ]
+  if (is_linux) {
+    sources += [
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/aes-x86_64-elf.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/aesni-gcm-x86_64-elf.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/aesni-x86_64-elf.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/chacha-x86_64-elf.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/ghash-x86_64-elf.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/p256-x86_64-asm-elf.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/poly1305-x86_64-elf.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/sha256-x86_64-elf.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/sha512-x86_64-elf.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/vpaes-x86_64-elf.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/x86_64-mont-elf.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/x86_64-mont5-elf.S",
+    ]
+
+    # Supress "warning: '_GNU_SOURCE' macro redefined."
+    cflags = [ "-Wno-macro-redefined" ]
+  }
+  if (is_mac) {
+    sources += [
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/aes-x86_64-macosx.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/aesni-gcm-x86_64-macosx.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/aesni-x86_64-macosx.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/chacha-x86_64-macosx.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/ghash-x86_64-macosx.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/p256-x86_64-asm-macosx.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/poly1305-x86_64-macosx.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/sha256-x86_64-macosx.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/sha512-x86_64-macosx.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/vpaes-x86_64-macosx.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/x86_64-mont-macosx.S",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/x86_64-mont5-macosx.S",
+    ]
+  }
+  if (is_win) {
+    libs = [
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/aes-x86_64-nasm.obj",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/aesni-gcm-x86_64-nasm.obj",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/aesni-x86_64-nasm.obj",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/chacha-x86_64-nasm.obj",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/ghash-x86_64-nasm.obj",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/p256-x86_64-asm-nasm.obj",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/poly1305-x86_64-nasm.obj",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/sha256-x86_64-nasm.obj",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/sha512-x86_64-nasm.obj",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/vpaes-x86_64-nasm.obj",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/x86_64-mont-nasm.obj",
+      "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/pregenerated/x86_64-mont5-nasm.obj",
+    ]
+
+    # Suppress "warning: '_addcarry_u64' is not a recognized builtin."
+    cflags = [ "-Wno-ignored-pragma-intrinsic" ]
+  }
+}
+
+## Override: don't build 'ring-test' static library.
+# static_library("ring-test") {
+#   include_dirs = [ "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/include" ]
+#   sources = [ "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/crypto/constant_time_test.c" ]
+# }
+
 rust_crate("rustls") {
-  source_root = "$registry_github/rustls-0.14.0/src/lib.rs"
-  features = [ "default" ]
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rustls-0.14.0/src/lib.rs"
+  features = [
+    "default",
+    "log",
+    "logging",
+  ]
   extern = [
-    ":untrusted",
     ":base64",
     ":log",
     ":ring",
-    ":webpki",
     ":sct",
+    ":untrusted",
+    ":webpki",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
   ]
-  args = [ "-Aunused_variables" ]  # TODO Remove.
 }
 
-rust_crate("ct_logs") {
-  source_root = "$registry_github/ct-logs-0.4.0/src/lib.rs"
-  extern = [ ":sct" ]
+rust_crate("rustyline") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rustyline-2.1.0/src/lib.rs"
+  extern = [
+    ":dirs",
+    ":libc",
+    ":log",
+    ":memchr",
+    ":unicode_segmentation",
+    ":unicode_width",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+  if (is_posix) {
+    extern += [
+      ":nix",
+      ":utf8parse",
+    ]
+  }
+  if (is_win) {
+    extern += [ ":winapi" ]
+  }
+}
+
+rust_crate("ryu") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ryu-0.2.7/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+
+  # Added by custom-build script.
+  cfg = [
+    "integer128",
+    "must_use_return",
+  ]
+}
+
+rust_crate("safemem") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/safemem-0.3.0/src/lib.rs"
+  features = [
+    "default",
+    "std",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("scopeguard") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/scopeguard-0.3.3/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("sct") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/sct-0.4.0/src/lib.rs"
+  extern = [
+    ":ring",
+    ":untrusted",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("serde") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/serde-1.0.84/src/lib.rs"
+  features = [
+    "default",
+    "std",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+
+  # Added by custom-build script.
+  cfg = [
+    "core_duration",
+    "de_boxed_c_str",
+    "de_rc_dst",
+    "integer128",
+    "num_nonzero",
+    "range_inclusive",
+  ]
+}
+
+rust_crate("serde_json") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/serde_json-1.0.35/src/lib.rs"
+  features = [ "default" ]
+  extern = [
+    ":itoa",
+    ":ryu",
+    ":serde",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("slab") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/slab-0.4.2/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("smallvec") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/smallvec-0.6.7/lib.rs"
+  features = [
+    "default",
+    "std",
+  ]
+  extern = [ ":unreachable" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("source_map_mappings") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/source-map-mappings-0.5.0/src/lib.rs"
+  extern = [
+    ":vlq",
+
+    # Override: use rand v0.6.4 instead of v0.4.5.
+    ":rand",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+
+  ## Override: use rand v0.6.4 instead of v0.4.5.
+  # extern_version = [
+  #   {
+  #     crate_name = "rand"
+  #     crate_version = "0.4.5"
+  #   },
+  # ]
+}
+
+## Override: avoid dependency on on 'owning_ref'.
+# rust_crate("stable_deref_trait") {
+#   source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/stable_deref_trait-1.1.1/src/lib.rs"
+#   features = [
+#     "default",
+#     "std",
+#   ]
+#   args = [
+#     "--cap-lints",
+#     "allow",
+#   ]
+# }
+
+rust_crate("string") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/string-0.1.3/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("tempfile") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tempfile-3.0.5/src/lib.rs"
+  extern = [
+    ":cfg_if",
+    ":rand",
+    ":remove_dir_all",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+  if (is_posix) {
+    extern += [ ":libc" ]
+  }
+  if (is_win) {
+    extern += [ ":winapi" ]
+  }
+}
+
+rust_crate("time") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/time-0.1.42/src/lib.rs"
+  extern = [ ":libc" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+  if (is_win) {
+    extern += [ ":winapi" ]
+  }
+}
+
+rust_crate("tokio") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-0.1.14/src/lib.rs"
+  features = [
+    "bytes",
+    "codec",
+    "default",
+    "fs",
+    "io",
+    "mio",
+    "num_cpus",
+    "reactor",
+    "rt-full",
+    "tcp",
+    "timer",
+    "tokio-codec",
+    "tokio-current-thread",
+    "tokio-executor",
+    "tokio-fs",
+    "tokio-io",
+    "tokio-reactor",
+    "tokio-tcp",
+    "tokio-threadpool",
+    "tokio-timer",
+    "tokio-udp",
+    "tokio-uds",
+    "udp",
+    "uds",
+  ]
+  extern = [
+    ":bytes",
+    ":futures",
+    ":mio",
+    ":num_cpus",
+    ":tokio_codec",
+    ":tokio_current_thread",
+    ":tokio_executor",
+    ":tokio_fs",
+    ":tokio_io",
+    ":tokio_reactor",
+    ":tokio_tcp",
+    ":tokio_threadpool",
+    ":tokio_timer",
+    ":tokio_udp",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+  if (is_posix) {
+    extern += [ ":tokio_uds" ]
+  }
+}
+
+rust_crate("tokio_codec") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-codec-0.1.1/src/lib.rs"
+  extern = [
+    ":bytes",
+    ":futures",
+    ":tokio_io",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("tokio_current_thread") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-current-thread-0.1.4/src/lib.rs"
+  extern = [
+    ":futures",
+    ":tokio_executor",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("tokio_executor") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-executor-0.1.6/src/lib.rs"
+  extern = [
+    ":crossbeam_utils",
+    ":futures",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("tokio_fs") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-fs-0.1.5/src/lib.rs"
+  extern = [
+    ":futures",
+    ":tokio_io",
+    ":tokio_threadpool",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("tokio_io") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-io-0.1.11/src/lib.rs"
+  extern = [
+    ":bytes",
+    ":futures",
+    ":log",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("tokio_process") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-process-0.2.3/src/lib.rs"
+  extern = [
+    ":futures",
+    ":mio",
+    ":tokio_io",
+    ":tokio_reactor",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+  if (is_posix) {
+    extern += [
+      ":libc",
+      ":tokio_signal",
+    ]
+  }
+  if (is_win) {
+    extern += [
+      ":mio_named_pipes",
+      ":winapi",
+    ]
+  }
+}
+
+rust_crate("tokio_reactor") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-reactor-0.1.8/src/lib.rs"
+  extern = [
+    ":crossbeam_utils",
+    ":futures",
+    ":lazy_static",
+    ":log",
+    ":mio",
+    ":num_cpus",
+    ":parking_lot",
+    ":slab",
+    ":tokio_executor",
+    ":tokio_io",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
 }
 
 rust_crate("tokio_rustls") {
-  source_root = "$registry_github/tokio-rustls-0.8.0/src/lib.rs"
-  extern = [
-    ":rustls",
-    ":webpki",
-    ":tokio",
-  ]
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-rustls-0.8.1/src/lib.rs"
   features = [
     "default",
-    "tokio",
+    "futures",
+    "tokio-io",
     "tokio-support",
   ]
-  args = [ "-Adead_code" ]  # TODO Remove.
+  extern = [
+    ":futures",
+    ":rustls",
+    ":tokio_io",
+    ":webpki",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("tokio_tcp") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-tcp-0.1.3/src/lib.rs"
+  extern = [
+    ":bytes",
+    ":futures",
+    ":iovec",
+    ":mio",
+    ":tokio_io",
+    ":tokio_reactor",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("tokio_threadpool") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-threadpool-0.1.10/src/lib.rs"
+  extern = [
+    ":crossbeam_channel",
+    ":crossbeam_deque",
+    ":crossbeam_utils",
+    ":futures",
+    ":log",
+    ":num_cpus",
+    ":rand",
+    ":tokio_executor",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("tokio_timer") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-timer-0.2.8/src/lib.rs"
+  extern = [
+    ":crossbeam_utils",
+    ":futures",
+    ":slab",
+    ":tokio_executor",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("tokio_udp") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-udp-0.1.3/src/lib.rs"
+  extern = [
+    ":bytes",
+    ":futures",
+    ":log",
+    ":mio",
+    ":tokio_codec",
+    ":tokio_io",
+    ":tokio_reactor",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("try_lock") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/try-lock-0.2.2/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("unicode_bidi") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/unicode-bidi-0.3.4/src/lib.rs"
+  features = [ "default" ]
+  extern = [ ":matches" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("unicode_normalization") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/unicode-normalization-0.1.7/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("unicode_segmentation") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/unicode-segmentation-1.2.1/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("unicode_width") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/unicode-width-0.1.5/src/lib.rs"
+  features = [ "default" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("unreachable") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/unreachable-1.0.0/src/lib.rs"
+  extern = [ ":void" ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
 }
 
 rust_crate("untrusted") {
-  source_root = "$registry_github/untrusted-0.6.2/src/untrusted.rs"
-  extern = []
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/untrusted-0.6.2/src/untrusted.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("url") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/url-1.7.2/src/lib.rs"
+  extern = [
+    ":idna",
+    ":matches",
+    ":percent_encoding",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("vlq") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/vlq-0.5.1/src/lib.rs"
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("void") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/void-1.0.2/src/lib.rs"
+  features = [
+    "default",
+    "std",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
+}
+
+rust_crate("want") {
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/want-0.0.6/src/lib.rs"
+  extern = [
+    ":futures",
+    ":log",
+    ":try_lock",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
 }
 
 rust_crate("webpki") {
-  source_root = "$registry_github/webpki-0.18.1/src/webpki.rs"
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/webpki-0.18.1/src/webpki.rs"
   features = [
+    "default",
     "std",
     "trust_anchor_util",
   ]
@@ -944,209 +1445,350 @@ rust_crate("webpki") {
     ":ring",
     ":untrusted",
   ]
+  args = [
+    "--cap-lints",
+    "allow",
+  ]
 }
 
 rust_crate("webpki_roots") {
-  source_root = "$registry_github/webpki-roots-0.15.0/src/lib.rs"
+  source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/webpki-roots-0.15.0/src/lib.rs"
   extern = [
+    ":untrusted",
     ":webpki",
-    ":untrusted",
+  ]
+  args = [
+    "--cap-lints",
+    "allow",
   ]
 }
 
-rust_crate("sct") {
-  source_root = "$registry_github/sct-0.4.0/src/lib.rs"
-  extern = [
-    ":ring",
-    ":untrusted",
-  ]
-}
+## Override: use rand v0.6.4 instead.
+# rust_crate("rand-0.4.5") {
+#   crate_name = "rand"
+#   crate_version = "0.4.5"
+#   source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand-0.4.5/src/lib.rs"
+#   features = [
+#     "default",
+#     "libc",
+#     "std",
+#   ]
+#   args = [
+#     "--cap-lints",
+#     "allow",
+#   ]
+#   if (is_posix) {
+#     extern = [ ":libc" ]
+#   }
+#
+#   # Per the #[link(...)] attribute found in 'src/os.rs'.
+#   if (is_mac) {
+#     libs = [ "Security.framework" ]
+#   }
+#   if (is_win) {
+#     extern = [ ":winapi" ]
+#   }
+# }
 
-rust_crate("atty") {
-  source_root = "$registry_github/atty-0.2.11/src/lib.rs"
-  extern = [
-    ":libc",
-    ":winapi",
-  ]
-}
-
-rust_crate("base64") {
-  source_root = "$registry_github/base64-0.9.3/src/lib.rs"
-  extern = [
-    ":byteorder",
-    ":safemem",
-  ]
-}
-
-rust_crate("safemem") {
-  source_root = "$registry_github/safemem-0.3.0/src/lib.rs"
-}
-
-rust_crate("scoped_tls") {
-  source_root = "$registry_github/scoped-tls-0.1.2/src/lib.rs"
-  extern = [
-    ":ring",
-    ":untrusted",
-  ]
-}
-
-rust_crate("smallvec") {
-  source_root = "$registry_github/smallvec-0.6.7/lib.rs"
-  extern = [ ":unreachable" ]
-  features = [ "std" ]
-}
-
-rust_crate("unreachable") {
-  source_root = "$registry_github/unreachable-1.0.0/src/lib.rs"
-  extern = [ ":void" ]
-}
-
-rust_crate("void") {
-  source_root = "$registry_github/void-1.0.2/src/lib.rs"
-  features = [ "default" ]
-}
-
-rust_crate("parking_lot") {
-  source_root = "$registry_github/parking_lot-0.6.4/src/lib.rs"
-  extern = [
-    ":parking_lot_core",
-    ":lock_api",
-  ]
-}
-
-rust_crate("parking_lot_core") {
-  source_root = "$registry_github/parking_lot_core-0.3.1/src/lib.rs"
-  extern = [
-    ":smallvec",
-    ":rand",
-    ":libc",
-    ":winapi",
-  ]
-}
-
-rust_crate("lock_api") {
-  source_root = "$registry_github/lock_api-0.1.5/src/lib.rs"
-  extern = [ ":scopeguard" ]
-}
-
-rust_crate("unicode_width") {
-  source_root = "$registry_github/unicode-width-0.1.5/src/lib.rs"
-}
-
-rust_crate("getopts") {
-  source_root = "$registry_github/getopts-0.2.18/src/lib.rs"
-  extern = [ ":unicode_width" ]
-}
-
-rust_crate("arc_swap") {
-  source_root = "$registry_github/arc-swap-0.3.6/src/lib.rs"
-}
-
-rust_crate("mio_named_pipes") {
-  source_root = "$registry_github/mio-named-pipes-0.1.6/src/lib.rs"
-  extern = [
-    ":log",
-    ":mio",
-    ":miow",
-    ":winapi",
-  ]
-}
-
-rust_crate("miow") {
-  source_root = "$registry_github/miow-0.3.3/src/lib.rs"
-  extern = [
-    ":socket2",
-    ":winapi",
-  ]
-}
-
-rust_crate("signal_hook") {
-  source_root = "$registry_github/signal-hook-0.1.6/src/lib.rs"
-  extern = [
-    ":arc_swap",
-    ":libc",
-  ]
-}
-
-rust_crate("socket2") {
-  source_root = "$registry_github/socket2-0.3.8/src/lib.rs"
-  extern = [ ":winapi" ]
-}
-
-rust_crate("tokio_signal") {
-  source_root = "$registry_github/tokio-signal-0.2.7/src/lib.rs"
-  extern = [
-    ":futures",
-    ":libc",
-    ":mio",
-    ":mio_uds",
-    ":signal_hook",
-    ":tokio_executor",
-    ":tokio_io",
-    ":tokio_reactor",
-  ]
-}
-
-rust_crate("tokio_process") {
-  source_root = "$registry_github/tokio-process-0.2.3/src/lib.rs"
-  extern = [
-    ":futures",
-    ":mio",
-    ":tokio_io",
-    ":tokio_reactor",
-  ]
-
-  if (is_win) {
-    extern += [
-      ":mio_named_pipes",
-      ":winapi",
+if (is_posix) {
+  rust_crate("arc_swap") {
+    source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/arc-swap-0.3.7/src/lib.rs"
+    args = [
+      "--cap-lints",
+      "allow",
     ]
-  } else {
-    extern += [
+  }
+
+  rust_crate("bitflags") {
+    source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/bitflags-1.0.4/src/lib.rs"
+    features = [ "default" ]
+    args = [
+      "--cap-lints",
+      "allow",
+    ]
+  }
+
+  rust_crate("mio_uds") {
+    source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/mio-uds-0.6.7/src/lib.rs"
+    extern = [
+      ":iovec",
       ":libc",
-      ":tokio_signal",
+      ":mio",
+    ]
+    args = [
+      "--cap-lints",
+      "allow",
+    ]
+  }
+
+  rust_crate("nix") {
+    source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/nix-0.11.0/src/lib.rs"
+    extern = [
+      ":bitflags",
+      ":cfg_if",
+      ":libc",
+      ":void",
+    ]
+    args = [
+      "--cap-lints",
+      "allow",
+    ]
+  }
+
+  rust_crate("signal_hook") {
+    source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/signal-hook-0.1.7/src/lib.rs"
+    extern = [
+      ":arc_swap",
+      ":libc",
+    ]
+    args = [
+      "--cap-lints",
+      "allow",
+    ]
+  }
+
+  rust_crate("tokio_signal") {
+    source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-signal-0.2.7/src/lib.rs"
+    extern = [
+      ":futures",
+      ":libc",
+      ":mio",
+      ":mio_uds",
+      ":signal_hook",
+      ":tokio_executor",
+      ":tokio_io",
+      ":tokio_reactor",
+    ]
+    args = [
+      "--cap-lints",
+      "allow",
+    ]
+  }
+
+  rust_crate("tokio_uds") {
+    source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-uds-0.2.5/src/lib.rs"
+    extern = [
+      ":bytes",
+      ":futures",
+      ":iovec",
+      ":libc",
+      ":log",
+      ":mio",
+      ":mio_uds",
+      ":tokio_codec",
+      ":tokio_io",
+      ":tokio_reactor",
+    ]
+    args = [
+      "--cap-lints",
+      "allow",
+    ]
+  }
+
+  rust_crate("utf8parse") {
+    source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/utf8parse-0.1.1/src/lib.rs"
+    args = [
+      "--cap-lints",
+      "allow",
     ]
   }
 }
 
-rust_crate("vlq") {
-  source_root = "$registry_github/vlq-0.5.1/src/lib.rs"
-}
+if (is_win) {
+  rust_crate("kernel32") {
+    source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/kernel32-sys-0.2.2/src/lib.rs"
+    extern_version = [
+      {
+        crate_name = "winapi"
+        crate_version = "0.2.8"
+      },
+    ]
+    args = [
+      "--cap-lints",
+      "allow",
+    ]
 
-rust_crate("source_map_mappings") {
-  source_root = "$registry_github/source-map-mappings-0.5.0/src/lib.rs"
-  extern = [
-    ":rand",
-    ":vlq",
-  ]
-}
+    # Added by custom-build script.
+    libs = [ "kernel32.lib" ]
+  }
 
-rust_crate("ryu") {
-  source_root = "$registry_github/ryu-0.2.7/src/lib.rs"
-  features = [ "small" ]
-}
+  rust_crate("mio_named_pipes") {
+    source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/mio-named-pipes-0.1.6/src/lib.rs"
+    extern = [
+      ":log",
+      ":mio",
+      ":miow",
+      ":winapi",
+    ]
+    args = [
+      "--cap-lints",
+      "allow",
+    ]
+  }
 
-rust_crate("serde") {
-  source_root = "$registry_github/serde-1.0.82/src/lib.rs"
-  features = [
-    "default",
-    "std",
-  ]
-}
+  rust_crate("miow") {
+    source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/miow-0.3.3/src/lib.rs"
+    extern = [
+      ":socket2",
+      ":winapi",
+    ]
+    args = [
+      "--cap-lints",
+      "allow",
+    ]
+  }
 
-rust_crate("serde_json") {
-  source_root = "$registry_github/serde_json-1.0.34/src/lib.rs"
-  features = [
-    "arbitrary_precision",
-    "default",
-    "preserve_order",
-    "indexmap",
-    "raw_value",
-  ]
-  extern = [
-    ":indexmap",
-    ":itoa",
-    ":ryu",
-    ":serde",
-  ]
+  rust_crate("socket2") {
+    source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/socket2-0.3.8/src/lib.rs"
+    extern = [ ":winapi" ]
+    args = [
+      "--cap-lints",
+      "allow",
+    ]
+  }
+
+  rust_crate("winapi") {
+    source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/winapi-0.3.6/src/lib.rs"
+    features = [
+      "consoleapi",
+      "dbghelp",
+      "errhandlingapi",
+      "fileapi",
+      "handleapi",
+      "ioapiset",
+      "knownfolders",
+      "minwinbase",
+      "minwindef",
+      "namedpipeapi",
+      "ntdef",
+      "ntsecapi",
+      "ntstatus",
+      "objbase",
+      "processenv",
+      "processthreadsapi",
+      "profileapi",
+      "shlobj",
+      "std",
+      "synchapi",
+      "sysinfoapi",
+      "threadpoollegacyapiset",
+      "timezoneapi",
+      "winbase",
+      "wincon",
+      "winerror",
+      "winnt",
+      "winsock2",
+      "winuser",
+      "ws2def",
+      "ws2ipdef",
+      "ws2tcpip",
+
+      # Added by custom-build script.
+      "basetsd",
+      "cfg",
+      "cfgmgr32",
+      "combaseapi",
+      "excpt",
+      "guiddef",
+      "in6addr",
+      "inaddr",
+      "ktmtypes",
+      "libloaderapi",
+      "limits",
+      "lsalookup",
+      "mstcpip",
+      "objidl",
+      "objidlbase",
+      "propidl",
+      "qos",
+      "rpc",
+      "rpcdce",
+      "rpcndr",
+      "shtypes",
+      "sspi",
+      "subauth",
+      "unknwnbase",
+      "vadefs",
+      "vcruntime",
+      "wincred",
+      "windef",
+      "wingdi",
+      "winreg",
+      "wtypes",
+      "wtypesbase",
+    ]
+    args = [
+      "--cap-lints",
+      "allow",
+    ]
+
+    # Added by custom-build script.
+    libs = [
+      "advapi32.lib",
+      "credui.lib",
+      "dbghelp.lib",
+      "fwpuclnt.lib",
+      "gdi32.lib",
+      "kernel32.lib",
+      "msimg32.lib",
+      "ntdll.lib",
+      "ole32.lib",
+      "opengl32.lib",
+      "secur32.lib",
+      "setupapi.lib",
+      "shell32.lib",
+      "synchronization.lib",
+      "user32.lib",
+      "winspool.lib",
+      "ws2_32.lib",
+    ]
+  }
+
+  rust_crate("ws2_32") {
+    source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ws2_32-sys-0.2.1/src/lib.rs"
+    extern_version = [
+      {
+        crate_name = "winapi"
+        crate_version = "0.2.8"
+      },
+    ]
+    args = [
+      "--cap-lints",
+      "allow",
+    ]
+
+    # Added by custom-build script.
+    libs = [ "ws2_32.lib" ]
+  }
+
+  rust_crate("miow-0.2.1") {
+    crate_name = "miow"
+    crate_version = "0.2.1"
+    source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/miow-0.2.1/src/lib.rs"
+    extern = [
+      ":kernel32",
+      ":net2",
+      ":ws2_32",
+    ]
+    extern_version = [
+      {
+        crate_name = "winapi"
+        crate_version = "0.2.8"
+      },
+    ]
+    args = [
+      "--cap-lints",
+      "allow",
+    ]
+  }
+
+  rust_crate("winapi-0.2.8") {
+    crate_name = "winapi"
+    crate_version = "0.2.8"
+    source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/winapi-0.2.8/src/lib.rs"
+    args = [
+      "--cap-lints",
+      "allow",
+    ]
+  }
 }
diff --git a/third_party b/third_party
index 324da53d40..95c87592da 160000
--- a/third_party
+++ b/third_party
@@ -1 +1 @@
-Subproject commit 324da53d40fe4c1f2fb41233f41f5000f28bad88
+Subproject commit 95c87592dac0c84083fa067217ec7aeabf255e59