diff --git a/.travis.yml b/.travis.yml
index 1bdef0f2..a4a87e2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,7 @@
 language: rust
 script: rustc -vV && cargo build --verbose && cargo test --verbose
 rust:
-  - 1.11.0
-  - 1.14.0
-  - 1.17.0
+  - 1.40.0
   - stable
   - beta
   - nightly
diff --git a/Cargo.lock b/Cargo.lock
index 15f73223..37c728a6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,72 +1,40 @@
-[root]
-name = "cargo-script"
-version = "0.2.9"
-dependencies = [
- "atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "chan 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap 2.23.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gcc 0.3.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "hoedown 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "scan-rules 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "semver 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "shaman 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winreg 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
 [[package]]
-name = "advapi32-sys"
-version = "0.2.0"
+name = "aho-corasick"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "aho-corasick"
-version = "0.5.3"
+name = "ansi_term"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "aho-corasick"
-version = "0.6.3"
+name = "atty"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "ansi_term"
-version = "0.9.0"
+name = "autocfg"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "atty"
-version = "0.2.2"
+name = "base-x"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "bitflags"
@@ -75,32 +43,92 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "bitflags"
-version = "0.8.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "chan"
-version = "0.1.19"
+name = "bumpalo"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cargo-script"
+version = "0.2.9"
 dependencies = [
- "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hoedown 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "open 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scan-rules 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "shaman 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winreg 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "clap"
-version = "2.23.2"
+version = "2.33.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "vec_map 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "discard"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "either"
 version = "1.1.0"
@@ -108,58 +136,78 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "env_logger"
-version = "0.4.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "fuchsia-zircon"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-zircon-sys"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "gcc"
-version = "0.3.45"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "hermit-abi"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "hoedown"
 version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gcc 0.3.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.4.19"
+name = "humantime"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "itertools"
-version = "0.5.10"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
-name = "kernel32-sys"
-version = "0.2.2"
+name = "itertools"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "ktmw32-sys"
-version = "0.1.0"
+name = "itoa"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "lazy_static"
@@ -168,99 +216,209 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "lazy_static"
-version = "0.2.6"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.21"
+version = "0.2.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "log"
-version = "0.3.7"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "maybe-uninit"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "memchr"
-version = "0.1.11"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "open"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "memchr"
-version = "1.0.1"
+name = "proc-macro-hack"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "ole32-sys"
-version = "0.2.0"
+name = "proc-macro2"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "open"
-version = "1.2.0"
+name = "proc-macro2"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quick-error"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "quote"
+version = "0.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand"
+version = "0.4.3"
+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.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rand"
-version = "0.3.15"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (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.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.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "redox_syscall"
-version = "0.1.17"
+name = "rand_chacha"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "regex"
-version = "0.1.80"
+name = "rand_core"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand_hc"
+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)",
+]
+
+[[package]]
+name = "rand_isaac"
+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 = "rand_os"
+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.66 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_pcg"
+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)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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)",
 ]
 
 [[package]]
 name = "regex"
-version = "0.2.1"
+version = "1.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.3.9"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "regex-syntax"
-version = "0.4.0"
+name = "remove_dir_all"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "rustc-serialize"
-version = "0.3.23"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -271,6 +429,19 @@ dependencies = [
  "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "scan-rules"
 version = "0.2.0"
@@ -289,39 +460,109 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "semver"
-version = "0.5.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "semver-parser 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "semver-parser"
-version = "0.6.2"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "serde"
+version = "1.0.111"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.111"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "shaman"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "shell32-sys"
-version = "0.1.1"
+name = "standback"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "stdweb"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stdweb-derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stdweb-internal-macros 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stdweb-internal-runtime 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "stdweb-derive"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "stdweb-internal-macros"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base-x 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "stdweb-internal-runtime"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "strcursor"
 version = "0.2.5"
@@ -333,89 +574,107 @@ dependencies = [
 
 [[package]]
 name = "strsim"
-version = "0.6.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "tempdir"
-version = "0.3.5"
+name = "syn"
+version = "0.15.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "term_size"
-version = "0.3.0"
+name = "syn"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "thread-id"
-version = "2.0.0"
+name = "tempdir"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "thread-id"
-version = "3.0.0"
+name = "termcolor"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "thread_local"
-version = "0.2.7"
+name = "textwrap"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "thread_local"
-version = "0.3.3"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "thread-id 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "time"
-version = "0.1.36"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "standback 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "stdweb 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "toml"
-version = "0.2.1"
+name = "time-macros"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rustc-serialize 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time-macros-impl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "unicode-segmentation"
-version = "0.1.2"
+name = "time-macros-impl"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "toml"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -424,123 +683,213 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "unreachable"
-version = "0.1.1"
+name = "unicode-xid"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "vec_map"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "version_check"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "utf8-ranges"
-version = "0.1.3"
+name = "wasm-bindgen-backend"
+version = "0.2.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "utf8-ranges"
-version = "1.0.0"
+name = "wasm-bindgen-macro"
+version = "0.2.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro-support 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "uuid-sys"
-version = "0.1.2"
+name = "wasm-bindgen-macro-support"
+version = "0.2.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "vec_map"
-version = "0.7.0"
+name = "wasm-bindgen-shared"
+version = "0.2.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "void"
-version = "1.0.2"
+name = "winapi"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "winapi"
-version = "0.2.8"
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "winapi-build"
+name = "winapi-util"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "winreg"
+name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "wincolor"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winreg"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "ktmw32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [metadata]
-"checksum advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e06588080cb19d0acb6739808aafa5f26bfb2ca015b2b6370028b44cf7cb8a9a"
-"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
-"checksum aho-corasick 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699"
-"checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
-"checksum atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159"
+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+"checksum base-x 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1"
 "checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23"
-"checksum bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4"
-"checksum chan 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "f93bfe971116428a9066c1c3c69a09ae3ef69432f8418be28ab50f96783e6a50"
-"checksum clap 2.23.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf1114886d7cde2d6448517161d7db8d681a9a1c09f7d210f0b0864e48195f6"
+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708"
+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+"checksum clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum crossbeam-channel 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061"
+"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
+"checksum discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
 "checksum either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18785c1ba806c258137c937e44ada9ee7e69a37e3c72077542cd2f069d78562a"
-"checksum env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e3856f1697098606fc6cb97a93de88ca3f3bc35bb878c725920e6e82ecf05e83"
-"checksum gcc 0.3.45 (registry+https://github.com/rust-lang/crates.io-index)" = "40899336fb50db0c78710f53e87afc54d8c7266fb76262fecc78ca1a7f09deae"
+"checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
+"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
+"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
 "checksum hoedown 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5bde173f287441e7c95cf9f32b7b68f6e5fc1bbed35085be68216cf6cc955d5"
+"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
 "checksum itertools 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)" = "c4a9b56eb56058f43dc66e58f40a214b2ccbc9f3df51861b63d51dec7b65bc3f"
-"checksum itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4833d6978da405305126af4ac88569b5d71ff758581ce5a987dbfa3755f694fc"
-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-"checksum ktmw32-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f9313a869ff779ae08dd990b75a92dc06aa16d771f41305f7286649cd39a0ee"
+"checksum itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
+"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
 "checksum lazy_static 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "cf186d1a8aa5f5bee5fd662bc9c1b949e0259e1bcc379d1f006847b0080c7417"
-"checksum lazy_static 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2f61b8421c7a4648c391611625d56fdd5c7567da05af1be655fd8cacc643abb3"
-"checksum libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "88ee81885f9f04bff991e306fea7c1c60a5f0f9e409e99f6b40e3311a3363135"
-"checksum log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5141eca02775a762cc6cd564d8d2c50f67c0ea3a372cbf1c51592b3e029e10ad"
-"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
-"checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4"
-"checksum ole32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c"
-"checksum open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3478ed1686bd1300c8a981a940abc92b06fac9cbef747f4c668d4e032ff7b842"
-"checksum rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "022e0636ec2519ddae48154b028864bdce4eaf7d35226ab8e65c611be97b189d"
-"checksum redox_syscall 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "29dbdfd4b9df8ab31dec47c6087b7b13cbf4a776f335e4de8efba8288dda075b"
-"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
-"checksum regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4278c17d0f6d62dfef0ab00028feb45bd7d2102843f80763474eeb1be8a10c01"
-"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
-"checksum regex-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9191b1f57603095f105d317e375d19b1c9c5c3185ea9633a99a6dcbed04457"
-"checksum rustc-serialize 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "684ce48436d6465300c9ea783b6b14c4361d6b8dcbb1375b486a69cc19e2dfb0"
+"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
+"checksum log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
+"checksum open 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c283bf0114efea9e42f1a60edea9859e8c47528eae09d01df4b29c1e489cc48"
+"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
+"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
+"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
+"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
+"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
+"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.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.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 regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+"checksum regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)" = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
+"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 "checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084"
+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
 "checksum scan-rules 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc8b462b0f8ce7deae199b4b5cecbbe01006f808408d815c09a9f7b11ee044ac"
 "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
-"checksum semver 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae2ff60ecdb19c255841c066cbfa5f8c2a4ada1eb3ae47c77ab6667128da71f5"
-"checksum semver-parser 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fff3c9c5a54636ab95acd8c1349926e04cb1eb8cd70b5adced8a1d1f703a67"
+"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.111 (registry+https://github.com/rust-lang/crates.io-index)" = "c9124df5b40cbd380080b2cc6ab894c040a3070d995f5c9dc77e18c34a8ae37d"
+"checksum serde_derive 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)" = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250"
+"checksum serde_json 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)" = "993948e75b189211a9b31a7528f950c6adc21f9720b6438ff80a7fa2f864cea2"
+"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 "checksum shaman 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b1a48b7e97a07b8f5771159e6914d8459557f8f833a60c4bd041f03736844f5"
-"checksum shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72f20b8f3c060374edb8046591ba28f62448c369ccbdc7b02075103fb3a9e38d"
+"checksum standback 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "47e4b8c631c998468961a9ea159f064c5c8499b95b5e4a34b77849d45949d540"
+"checksum stdweb 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
+"checksum stdweb-derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
+"checksum stdweb-internal-macros 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
+"checksum stdweb-internal-runtime 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
 "checksum strcursor 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a53cb721e1f6d0dbba1296e2d7770edbec9a4888fdd8f6a22fea97a0a69b465a"
-"checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694"
-"checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6"
-"checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209"
-"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
-"checksum thread-id 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4437c97558c70d129e40629a5b385b3fb1ffac301e63941335e4d354081ec14a"
-"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
-"checksum thread_local 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c85048c6260d17cf486ceae3282d9fb6b90be220bf5b28c400f5485ffc29f0c7"
-"checksum time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "211b63c112206356ef1ff9b19355f43740fc3f85960c598a93d3a3d3ba7beade"
-"checksum toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4"
+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
+"checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238"
+"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
+"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+"checksum thread_local 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "88ddf1ad580c7e3d1efff877d972bcc93f995556b9087a5a259630985c88ceab"
+"checksum time 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)" = "3a51cadc5b1eec673a685ff7c33192ff7b7603d0b75446fb354939ee615acb15"
+"checksum time-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9ae9b6e9f095bc105e183e3cd493d72579be3181ad4004fceb01adbe9eecab2d"
+"checksum time-macros-impl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e987cfe0537f575b5fc99909de6185f6c19c3ad8889e2275e686a873d0869ba1"
+"checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
 "checksum unicode-segmentation 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b905d0fc2a1f0befd86b0e72e31d1787944efef9d38b9358a9e92a69757f7e3b"
-"checksum unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18127285758f0e2c6cf325bb3f3d138a12fee27de4f23e146cd6a179f26c2cf3"
 "checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f"
-"checksum unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91"
-"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
-"checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
-"checksum uuid-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "24c821d9076a096232879d622d541a993de1242506a4f033f87269b9d1c8c665"
-"checksum vec_map 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8cdc8b93bd0198ed872357fb2e667f7125646b1762f16d60b2c96350d361897"
-"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-"checksum winreg 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf285379f20d7f26abd990d9a566be9d31ab7a9d335299baaa1f0604f5f96af"
+"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
+"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
+"checksum wasm-bindgen 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)" = "4de97fa1806bb1a99904216f6ac5e0c050dc4f8c676dc98775047c38e5c01b55"
+"checksum wasm-bindgen-backend 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)" = "5d82c170ef9f5b2c63ad4460dfcee93f3ec04a9a36a4cc20bc973c39e59ab8e3"
+"checksum wasm-bindgen-macro 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f07d50f74bf7a738304f6b8157f4a581e1512cd9e9cdb5baad8c31bbe8ffd81d"
+"checksum wasm-bindgen-macro-support 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)" = "95cf8fe77e45ba5f91bc8f3da0c3aa5d464b3d8ed85d84f4d4c7cc106436b1d7"
+"checksum wasm-bindgen-shared 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)" = "d9c2d4d4756b2e46d3a5422e06277d02e4d3e1d62d138b76a4c681e925743623"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "afc5508759c5bf4285e61feb862b6083c8480aec864fa17a81fdec6f69b461ab"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
+"checksum winreg 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
diff --git a/Cargo.toml b/Cargo.toml
index d99e16f2..02c6f3ca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,43 +16,48 @@ exclude = [
     ".travis.yml",
 ]
 
+edition = "2018"
+
 [features]
 default = ["suppress-cargo-output"]
-suppress-cargo-output = ["chan"]
+suppress-cargo-output = ["crossbeam-channel"]
 
 [dependencies]
-chan = { version = "0.1.19", optional = true }
-clap = "2.23.2"
-env_logger = "0.4.2"
+clap = "2.33.1"
+crossbeam-channel = { version = "0.4.2", optional = true }
+env_logger = "0.7.1"
 hoedown = "6.0.0"
-itertools = "0.5.10" # version 0.6 incompatible with Rust < 1.12
-lazy_static = "0.2.6"
-log = "0.3.7"
-open = "1.2.0"
-regex = "0.2.1"
-rustc-serialize = "0.3.23"
-semver = "0.5.1" # semver 0.6 incompatible with Rust < 1.14
+itertools = "0.9.0"
+lazy_static = "1.3.0"
+log = "0.4.11"
+open = "1.4.0"
+regex = "1.3.9"
+semver = "0.9.0"
+serde = { version = "1.0.111", features = ["derive"] }
+serde_json = "1.0.53"
 shaman = "0.1.0"
-time = "0.1.36"
-toml = "0.2.1" # toml 0.3 incompatible with Rust < 1.14.
+time = { version = "0.2.16", features = ["std"] }
+toml = "0.5.6"
 
 [target.'cfg(windows)'.dependencies]
-ole32-sys = "0.2.0"
-shell32-sys = "0.1.1"
-uuid-sys = "0.1.2" # WARNING: do not use with rustc < 1.15
-winapi = "0.2.8"
-winreg = "0.4.0"
+winapi = { version = "0.3.7", features = [
+    "combaseapi",
+    "knownfolders",
+    "minwindef",
+    "ntdef",
+    "shlobj",
+    "shtypes",
+    "winerror"
+] }
+winreg = "0.7.0"
 
 [target.'cfg(unix)'.dependencies]
-atty = "0.2.2"
+atty = "0.2.14"
 
 [dev-dependencies]
-gcc = "0.3.45"
+gcc = "0.3.55"
 scan-rules = "0.2.0"
-tempdir = "0.3.5"
-
-[build-dependencies]
-rustc_version = "0.1.7" # version 0.2 incompatible with Rust < 1.14
+tempdir = "0.3.7"
 
 [profile.release]
 lto = true
diff --git a/README.md b/README.md
index a97d3717..d9c459c6 100644
--- a/README.md
+++ b/README.md
@@ -111,6 +111,9 @@ The output of Cargo will be hidden unless compilation fails, or takes longer tha
     //! `cargo` "language".
     //!
     //! ```cargo
+    //! [package]
+    //! edition = "2018"
+    //!
     //! [dependencies]
     //! time = "0.1.25"
     //! ```
diff --git a/build.rs b/build.rs
index 28b5f5e2..f1accf79 100644
--- a/build.rs
+++ b/build.rs
@@ -7,8 +7,6 @@ Licensed under the MIT license (see LICENSE or <http://opensource.org
 files in the project carrying such notice may not be copied, modified,
 or distributed except according to those terms.
 */
-extern crate rustc_version;
-use rustc_version::{version_matches};
 
 fn main() {
     println!("cargo:rerun-if-changed=build.rs");
@@ -19,20 +17,4 @@ fn main() {
     if cfg!(windows) {
         println!("cargo:rustc-cfg=issue_50");
     }
-
-    /*
-    With 1.15, linking on Windows was changed in regards to when it emits `dllimport`.  This means that the *old* code for linking to `FOLDERID_LocalAppData` no longer works.  Unfortunately, it *also* means that the *new* code doesn't work prior to 1.15.
-
-    This controls which linking behaviour we need to work with.
-    */
-    if version_matches("<1.15.0") {
-        println!("cargo:rustc-cfg=old_rustc_windows_linking_behaviour");
-    }
-
-    /*
-    Before 1.13, there was no `?` operator. One of the tests needs this information.
-    */
-    if version_matches(">=1.13.0") {
-        println!("cargo:rustc-cfg=has_qmark");
-    }
 }
diff --git a/src/bin/run-cargo-script.rs b/src/bin/run-cargo-script.rs
index 85d5c8f1..1adf5594 100644
--- a/src/bin/run-cargo-script.rs
+++ b/src/bin/run-cargo-script.rs
@@ -38,9 +38,7 @@ fn main() {
 
     let mut cmd = Command::new("cargo");
 
-    cmd.arg("script")
-        .arg(path)
-        .arg("--");
+    cmd.arg("script").arg(path).arg("--");
 
     for arg in args {
         cmd.arg(arg);
@@ -51,7 +49,7 @@ fn main() {
         Err(_) => None,
     } {
         Some(c) => c,
-        None => !0
+        None => !0,
     };
     std::process::exit(exit_status);
 }
diff --git a/src/consts.rs b/src/consts.rs
index b59c90ca..4818302e 100644
--- a/src/consts.rs
+++ b/src/consts.rs
@@ -184,4 +184,4 @@ Measured in milliseconds.
 */
 // It's been *one week* since you looked at me,
 // cocked your head to the side and said "I'm angry."
-pub const MAX_CACHE_AGE_MS: u64 = 1*7*24*60*60*1000;
+pub const MAX_CACHE_AGE_MS: u64 = 1 * 7 * 24 * 60 * 60 * 1000;
diff --git a/src/error.rs b/src/error.rs
index 1b13d427..ab317393 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -29,7 +29,7 @@ Represents an error in the program.
 pub enum MainError {
     Io(Blame, io::Error),
     Tag(Blame, Cow<'static, str>, Box<MainError>),
-    Other(Blame, Box<Error>),
+    Other(Blame, Box<dyn Error>),
     OtherOwned(Blame, String),
     OtherBorrowed(Blame, &'static str),
 }
@@ -40,7 +40,10 @@ Records who we have chosen to blame for a particular error.
 This is used to distinguish between "report this to a user" and "explode violently".
 */
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub enum Blame { Human, Internal }
+pub enum Blame {
+    Human,
+    Internal,
+}
 
 impl MainError {
     pub fn blame(&self) -> Blame {
@@ -50,7 +53,7 @@ impl MainError {
             | Tag(blame, _, _)
             | Other(blame, _)
             | OtherOwned(blame, _)
-            | OtherBorrowed(blame, _) => blame
+            | OtherBorrowed(blame, _) => blame,
         }
     }
 
@@ -65,14 +68,13 @@ impl MainError {
             | Tag(ref mut cur_blame, _, _)
             | Other(ref mut cur_blame, _)
             | OtherOwned(ref mut cur_blame, _)
-            | OtherBorrowed(ref mut cur_blame, _)
-            => *cur_blame = blame,
+            | OtherBorrowed(ref mut cur_blame, _) => *cur_blame = blame,
         }
     }
 }
 
 impl fmt::Display for MainError {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> StdResult<(), fmt::Error> {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> StdResult<(), fmt::Error> {
         use self::MainError::*;
         use std::fmt::Display;
         match *self {
@@ -105,7 +107,7 @@ macro_rules! from_impl {
                 $e
             }
         }
-    }
+    };
 }
 
 from_impl! { (Blame, io::Error) => MainError, v -> MainError::Io(v.0, v.1) }
@@ -115,7 +117,10 @@ from_impl! { io::Error => MainError, v -> MainError::Io(Blame::Internal, v) }
 from_impl! { String => MainError, v -> MainError::OtherOwned(Blame::Internal, v) }
 from_impl! { &'static str => MainError, v -> MainError::OtherBorrowed(Blame::Internal, v) }
 
-impl<T> From<Box<T>> for MainError where T: 'static + Error {
+impl<T> From<Box<T>> for MainError
+where
+    T: 'static + Error,
+{
     fn from(src: Box<T>) -> Self {
         MainError::Other(Blame::Internal, src)
     }
@@ -124,7 +129,8 @@ impl<T> From<Box<T>> for MainError where T: 'static + Error {
 pub trait ResultExt {
     type Ok;
     fn err_tag<S>(self, msg: S) -> Result<Self::Ok>
-    where S: Into<Cow<'static, str>>;
+    where
+        S: Into<Cow<'static, str>>;
 
     fn shift_blame(self, blame: Blame) -> Self;
 }
@@ -132,8 +138,10 @@ pub trait ResultExt {
 impl<T> ResultExt for Result<T> {
     type Ok = T;
 
-    fn err_tag<S>(self, msg: S) -> Result<Self::Ok>
-    where S: Into<Cow<'static, str>> {
+    fn err_tag<S>(self, msg: S) -> Result<<Self as ResultExt>::Ok>
+    where
+        S: Into<Cow<'static, str>>,
+    {
         match self {
             Ok(v) => Ok(v),
             Err(e) => Err(MainError::Tag(e.blame(), msg.into(), Box::new(e))),
@@ -146,7 +154,7 @@ impl<T> ResultExt for Result<T> {
             Err(mut e) => {
                 e.shift_blame(blame);
                 Err(e)
-            },
+            }
         }
     }
 }
diff --git a/src/file_assoc.rs b/src/file_assoc.rs
index b3fc451c..923bae11 100644
--- a/src/file_assoc.rs
+++ b/src/file_assoc.rs
@@ -13,13 +13,10 @@ This module deals with setting up file associations.
 Since this only makes sense on Windows, this entire module is Windows-only.
 */
 #![cfg(windows)]
-extern crate itertools;
-extern crate winreg;
 
+use crate::error::{Blame, Result};
+use itertools::Itertools;
 use std::io;
-use clap;
-use self::itertools::Itertools;
-use error::{Blame, Result};
 
 #[derive(Debug)]
 pub enum Args {
@@ -46,23 +43,21 @@ impl Args {
             )
     }
 
-    pub fn parse(m: &clap::ArgMatches) -> Self {
+    pub fn parse(m: &clap::ArgMatches<'_>) -> Self {
         match m.subcommand() {
-            ("install", Some(m)) => {
-                Args::Install {
-                    amend_pathext: m.is_present("amend_pathext"),
-                }
+            ("install", Some(m)) => Args::Install {
+                amend_pathext: m.is_present("amend_pathext"),
             },
             ("uninstall", _) => Args::Uninstall,
-            (name, _) => panic!("bad subcommand: {:?}", name)
+            (name, _) => panic!("bad subcommand: {:?}", name),
         }
     }
 }
 
 pub fn try_main(args: Args) -> Result<i32> {
     match args {
-        Args::Install { amend_pathext } => try!(install(amend_pathext)),
-        Args::Uninstall => try!(uninstall()),
+        Args::Install { amend_pathext } => install(amend_pathext)?,
+        Args::Uninstall => uninstall()?,
     }
 
     Ok(0)
@@ -70,12 +65,12 @@ pub fn try_main(args: Args) -> Result<i32> {
 
 fn install(amend_pathext: bool) -> Result<()> {
     use std::env;
-    use self::winreg::RegKey;
-    use self::winreg::enums as wre;
+    use winreg::enums as wre;
+    use winreg::RegKey;
 
     // Set up file association.
-    let cs_path = try!(env::current_exe());
-    let cs_path = try!(cs_path.canonicalize());
+    let cs_path = env::current_exe()?;
+    let cs_path = cs_path.canonicalize()?;
     let rcs_path = cs_path.with_file_name("run-cargo-script.exe");
 
     if !rcs_path.exists() {
@@ -92,14 +87,14 @@ fn install(amend_pathext: bool) -> Result<()> {
 
     let res = (|| -> io::Result<()> {
         let hlcr = RegKey::predef(wre::HKEY_CLASSES_ROOT);
-        let dot_crs = try!(hlcr.create_subkey(".crs"));
-        try!(dot_crs.set_value("", &"CargoScript.Crs"));
+        let dot_crs = hlcr.create_subkey(".crs")?;
+        dot_crs.set_value("", &"CargoScript.Crs")?;
 
-        let cs_crs = try!(hlcr.create_subkey("CargoScript.Crs"));
-        try!(cs_crs.set_value("", &"Cargo Script"));
+        let cs_crs = hlcr.create_subkey("CargoScript.Crs")?;
+        cs_crs.set_value("", &"Cargo Script")?;
 
-        let sh_o_c = try!(cs_crs.create_subkey(r#"shell\open\command"#));
-        try!(sh_o_c.set_value("", &format!(r#""{}" "%1" %*"#, rcs_path)));
+        let sh_o_c = cs_crs.create_subkey(r#"shell\open\command"#)?;
+        sh_o_c.set_value("", &format!(r#""{}" "%1" %*"#, rcs_path))?;
         Ok(())
     })();
 
@@ -107,7 +102,9 @@ fn install(amend_pathext: bool) -> Result<()> {
         Ok(()) => (),
         Err(e) => {
             if e.kind() == io::ErrorKind::PermissionDenied {
-                println!("Access denied.  Make sure you run this command from an administrator prompt.");
+                println!(
+                    "Access denied.  Make sure you run this command from an administrator prompt."
+                );
                 return Err((Blame::Human, e).into());
             } else {
                 return Err(e.into());
@@ -120,36 +117,41 @@ fn install(amend_pathext: bool) -> Result<()> {
 
     // Amend PATHEXT.
     if amend_pathext {
-        use std::ascii::AsciiExt;
-
         let hklm = RegKey::predef(wre::HKEY_LOCAL_MACHINE);
-        let env = try!(hklm.open_subkey(r#"SYSTEM\CurrentControlSet\Control\Session Manager\Environment"#));
+        let env =
+            hklm.open_subkey(r#"SYSTEM\CurrentControlSet\Control\Session Manager\Environment"#)?;
 
-        let pathext: String = try!(env.get_value("PATHEXT"));
+        let pathext: String = env.get_value("PATHEXT")?;
         if !pathext.split(";").any(|e| e.eq_ignore_ascii_case(".crs")) {
             let pathext = pathext.split(";").chain(Some(".CRS")).join(";");
-            try!(env.set_value("PATHEXT", &pathext));
+            env.set_value("PATHEXT", &pathext)?;
         }
 
-        println!("Added `.crs` to PATHEXT.  You may need to log out for the change to take effect.");
+        println!(
+            "Added `.crs` to PATHEXT.  You may need to log out for the change to take effect."
+        );
     }
 
     Ok(())
 }
 
 fn uninstall() -> Result<()> {
-    use self::winreg::RegKey;
-    use self::winreg::enums as wre;
+    use winreg::enums as wre;
+    use winreg::RegKey;
 
     let mut ignored_missing = false;
     {
         let mut notify = || ignored_missing = true;
 
         let hlcr = RegKey::predef(wre::HKEY_CLASSES_ROOT);
-        try!(hlcr.delete_subkey(r#"CargoScript.Crs\shell\open\command"#).ignore_missing_and(&mut notify));
-        try!(hlcr.delete_subkey(r#"CargoScript.Crs\shell\open"#).ignore_missing_and(&mut notify));
-        try!(hlcr.delete_subkey(r#"CargoScript.Crs\shell"#).ignore_missing_and(&mut notify));
-        try!(hlcr.delete_subkey(r#"CargoScript.Crs"#).ignore_missing_and(&mut notify));
+        hlcr.delete_subkey(r#"CargoScript.Crs\shell\open\command"#)
+            .ignore_missing_and(&mut notify)?;
+        hlcr.delete_subkey(r#"CargoScript.Crs\shell\open"#)
+            .ignore_missing_and(&mut notify)?;
+        hlcr.delete_subkey(r#"CargoScript.Crs\shell"#)
+            .ignore_missing_and(&mut notify)?;
+        hlcr.delete_subkey(r#"CargoScript.Crs"#)
+            .ignore_missing_and(&mut notify)?;
     }
 
     if ignored_missing {
@@ -158,15 +160,17 @@ fn uninstall() -> Result<()> {
     println!("Deleted run-cargo-script registry entry.");
 
     {
-        use std::ascii::AsciiExt;
-
         let hklm = RegKey::predef(wre::HKEY_LOCAL_MACHINE);
-        let env = try!(hklm.open_subkey(r#"SYSTEM\CurrentControlSet\Control\Session Manager\Environment"#));
+        let env =
+            hklm.open_subkey(r#"SYSTEM\CurrentControlSet\Control\Session Manager\Environment"#)?;
 
-        let pathext: String = try!(env.get_value("PATHEXT"));
+        let pathext: String = env.get_value("PATHEXT")?;
         if pathext.split(";").any(|e| e.eq_ignore_ascii_case(".crs")) {
-            let pathext = pathext.split(";").filter(|e| !e.eq_ignore_ascii_case(".crs")).join(";");
-            try!(env.set_value("PATHEXT", &pathext));
+            let pathext = pathext
+                .split(";")
+                .filter(|e| !e.eq_ignore_ascii_case(".crs"))
+                .join(";");
+            env.set_value("PATHEXT", &pathext)?;
             println!("Removed `.crs` from PATHEXT.  You may need to log out for the change to take effect.");
         }
     }
@@ -176,12 +180,15 @@ fn uninstall() -> Result<()> {
 
 trait IgnoreMissing {
     fn ignore_missing_and<F>(self, f: F) -> Self
-    where F: FnOnce();
+    where
+        F: FnOnce();
 }
 
 impl IgnoreMissing for io::Result<()> {
     fn ignore_missing_and<F>(self, f: F) -> Self
-    where F: FnOnce() {
+    where
+        F: FnOnce(),
+    {
         match self {
             Ok(()) => Ok(()),
             Err(e) => {
diff --git a/src/main.rs b/src/main.rs
index 1ac1e0ff..7496d20e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,19 +18,9 @@ As such, `cargo-script` does two major things:
 
 2. It caches the generated and compiled packages, regenerating them only if the script or its metadata have changed.
 */
-extern crate clap;
-extern crate env_logger;
-#[macro_use] extern crate lazy_static;
-#[macro_use] extern crate log;
-extern crate open;
-extern crate regex;
-extern crate rustc_serialize;
-extern crate semver;
-extern crate shaman;
-extern crate toml;
-
-#[cfg(feature="chan")]
-#[macro_use] extern crate chan;
+use lazy_static::lazy_static;
+use log::{debug, error, info, log_enabled, trace};
+use serde::{Deserialize, Serialize};
 
 /**
 If this is set to `true`, the digests used for package IDs will be replaced with "stub" to make testing a bit easier.  Obviously, you don't want this `true` for release...
@@ -45,7 +35,7 @@ const ALLOW_AUTO_REMOVE: bool = true;
 /**
 Length of time to suppress Cargo output.
 */
-#[cfg(feature="suppress-cargo-output")]
+#[cfg(feature = "suppress-cargo-output")]
 const CARGO_OUTPUT_TIMEOUT: u64 = 2_000/*ms*/;
 
 // This macro exists for 1.11 support.
@@ -57,7 +47,7 @@ macro_rules! if_windows {
 
 #[cfg(not(windows))]
 macro_rules! if_windows {
-    ($($tts:tt)*) => { {} };
+    ($($tts:tt)*) => {{}};
 }
 
 mod consts;
@@ -73,6 +63,7 @@ mod file_assoc;
 #[cfg(not(windows))]
 mod file_assoc {}
 
+use semver::Version;
 use std::borrow::Cow;
 use std::error::Error;
 use std::ffi::OsString;
@@ -80,11 +71,10 @@ use std::fs;
 use std::io::{Read, Write};
 use std::path::{Path, PathBuf};
 use std::process::{self, Command};
-use semver::Version;
 
-use error::{Blame, MainError, Result, ResultExt};
-use platform::MigrationKind;
-use util::{ChainMap, Defer, PathExt};
+use crate::error::{Blame, MainError, Result, ResultExt};
+use crate::platform::MigrationKind;
+use crate::util::{ChainMap, Defer, PathExt};
 
 #[derive(Debug)]
 enum SubCommand {
@@ -148,13 +138,13 @@ impl BuildKind {
             (false, false) => BuildKind::Normal,
             (true, false) => BuildKind::Test,
             (false, true) => BuildKind::Bench,
-            _ => panic!("got both test and bench")
+            _ => panic!("got both test and bench"),
         }
     }
 }
 
 fn parse_args() -> SubCommand {
-    use clap::{App, Arg, ArgGroup, SubCommand, AppSettings};
+    use clap::{App, AppSettings, Arg, ArgGroup, SubCommand};
     let version = option_env!("CARGO_PKG_VERSION").unwrap_or("unknown");
     let about = r#"Compiles and runs "Cargoified Rust scripts"."#;
 
@@ -195,14 +185,12 @@ fn parse_args() -> SubCommand {
                 .help("Execute <script> as a literal expression and display the result.")
                 .long("expr")
                 .short("e")
-                .conflicts_with_all(csas!["loop"])
                 .requires("script")
             )
             .arg(Arg::with_name("loop")
                 .help("Execute <script> as a literal closure once for each line from stdin.")
                 .long("loop")
                 .short("l")
-                .conflicts_with_all(csas!["expr"])
                 .requires("script")
             )
             .group(ArgGroup::with_name("expr_or_loop")
@@ -333,19 +321,21 @@ fn parse_args() -> SubCommand {
         .get_matches();
 
     if let Some(m) = m.subcommand_matches("templates") {
-        return ::SubCommand::Templates(templates::Args::parse(m));
+        return crate::SubCommand::Templates(templates::Args::parse(m));
     }
 
     if_windows! {
         if let Some(m) = m.subcommand_matches("file-association") {
-            return ::SubCommand::FileAssoc(file_assoc::Args::parse(m));
+            return crate::SubCommand::FileAssoc(file_assoc::Args::parse(m));
         }
     }
 
     let m = m.subcommand_matches("script").unwrap();
 
     fn owned_vec_string<'a, I>(v: Option<I>) -> Vec<String>
-    where I: ::std::iter::Iterator<Item=&'a str> {
+    where
+        I: ::std::iter::Iterator<Item = &'a str>,
+    {
         v.map(|itr| itr.map(Into::into).collect()).unwrap_or(vec![])
     }
 
@@ -353,7 +343,7 @@ fn parse_args() -> SubCommand {
         v.map(|v| match v {
             "yes" => true,
             "no" => false,
-            _ => unreachable!()
+            _ => unreachable!(),
         })
     }
 
@@ -361,11 +351,11 @@ fn parse_args() -> SubCommand {
         v.map(|v| match v {
             "dry-run" => MigrationKind::DryRun,
             "for-real" => MigrationKind::ForReal,
-            _ => unreachable!()
+            _ => unreachable!(),
         })
     }
 
-    ::SubCommand::Script(Args {
+    crate::SubCommand::Script(Args {
         script: m.value_of("script").map(Into::into),
         args: owned_vec_string(m.values_of("args")),
         features: m.value_of("features").map(Into::into),
@@ -392,7 +382,7 @@ fn parse_args() -> SubCommand {
 }
 
 fn main() {
-    env_logger::init().unwrap();
+    env_logger::init();
     info!("starting");
     info!("args: {:?}", std::env::args().collect::<Vec<_>>());
     let stderr = &mut std::io::stderr();
@@ -400,11 +390,11 @@ fn main() {
         Ok(0) => (),
         Ok(code) => {
             std::process::exit(code);
-        },
+        }
         Err(ref err) if err.is_human() => {
             writeln!(stderr, "error: {}", err).unwrap();
             std::process::exit(1);
-        },
+        }
         Err(ref err) => {
             writeln!(stderr, "internal error: {}", err).unwrap();
             std::process::exit(1);
@@ -433,13 +423,13 @@ fn try_main() -> Result<i32> {
             (0, Ok(())) => {
                 println!("Nothing to do.");
                 return Ok(0);
-            },
+            }
             (_, Ok(())) => {
                 for entry in log {
                     println!("- {}", entry);
                 }
                 return Ok(0);
-            },
+            }
             (_, Err(err)) => {
                 for entry in log {
                     println!("- {}", entry);
@@ -449,9 +439,9 @@ fn try_main() -> Result<i32> {
         }
     }
 
-    if log_enabled!(log::LogLevel::Debug) {
-        let scp = try!(get_script_cache_path());
-        let bcp = try!(get_binary_cache_path());
+    if log_enabled!(log::Level::Debug) {
+        let scp = get_script_cache_path()?;
+        let bcp = get_binary_cache_path()?;
         debug!("script-cache path: {:?}", scp);
         debug!("binary-cache path: {:?}", bcp);
     }
@@ -463,7 +453,7 @@ fn try_main() -> Result<i32> {
     2. Do it *before* we start trying to read the input so that, later on, we can make `<script>` optional, but still supply `--clear-cache`.
     */
     if args.clear_cache {
-        try!(clean_cache(0));
+        clean_cache(0)?;
 
         // If we *did not* get a `<script>` argument, that's OK.
         if args.script.is_none() {
@@ -481,33 +471,33 @@ fn try_main() -> Result<i32> {
 
     let input = match (args.script, args.expr, args.loop_) {
         (Some(script), false, false) => {
-            let (path, mut file) = try!(find_script(script).ok_or("could not find script"));
+            let (path, mut file) = find_script(script).ok_or("could not find script")?;
 
-            script_name = path.file_stem()
+            script_name = path
+                .file_stem()
                 .map(|os| os.to_string_lossy().into_owned())
                 .unwrap_or("unknown".into());
 
             let mut body = String::new();
-            try!(file.read_to_string(&mut body));
+            file.read_to_string(&mut body)?;
 
             let mtime = platform::file_last_modified(&file);
 
-            script_path = try!(std::env::current_dir()).join(path);
+            script_path = std::env::current_dir()?.join(path);
             content = body;
 
             Input::File(&script_name, &script_path, &content, mtime)
-        },
+        }
         (Some(expr), true, false) => {
             content = expr;
             Input::Expr(&content, args.template.as_ref().map(|s| &**s))
-        },
+        }
         (Some(loop_), false, true) => {
             content = loop_;
             Input::Loop(&content, args.count)
-        },
-        (None, _, _) => try!(Err((Blame::Human, consts::NO_ARGS_MESSAGE))),
-        _ => try!(Err((Blame::Human,
-            "cannot specify both --expr and --loop")))
+        }
+        (None, _, _) => Err((Blame::Human, consts::NO_ARGS_MESSAGE))?,
+        _ => Err((Blame::Human, "cannot specify both --expr and --loop"))?,
     };
     info!("input: {:?}", input);
 
@@ -519,41 +509,48 @@ fn try_main() -> Result<i32> {
     - Expand `pkg` into `pkg=*`.
     */
     let deps = {
-        use std::collections::HashMap;
         use std::collections::hash_map::Entry::{Occupied, Vacant};
+        use std::collections::HashMap;
 
         let mut deps: HashMap<String, String> = HashMap::new();
         for dep in args.dep.iter().chain(args.dep_extern.iter()).cloned() {
             // Append '=*' if it needs it.
             let dep = match dep.find('=') {
                 Some(_) => dep,
-                None => dep + "=*"
+                None => dep + "=*",
             };
 
             let mut parts = dep.splitn(2, '=');
             let name = parts.next().expect("dependency is missing name");
             let version = parts.next().expect("dependency is missing version");
-            assert!(parts.next().is_none(), "dependency somehow has three parts?!");
+            assert!(
+                parts.next().is_none(),
+                "dependency somehow has three parts?!"
+            );
 
             if name == "" {
-                try!(Err((Blame::Human, "cannot have empty dependency package name")));
+                Err((Blame::Human, "cannot have empty dependency package name"))?;
             }
 
             if version == "" {
-                try!(Err((Blame::Human, "cannot have empty dependency version")));
+                Err((Blame::Human, "cannot have empty dependency version"))?;
             }
 
             match deps.entry(name.into()) {
                 Vacant(ve) => {
                     ve.insert(version.into());
-                },
+                }
                 Occupied(oe) => {
                     // This is *only* a problem if the versions don't match.  We won't try to do anything clever in terms of upgrading or resolving or anything... exact match or go home.
                     let existing = oe.get();
                     if &version != existing {
-                        try!(Err((Blame::Human,
-                            format!("conflicting versions for dependency '{}': '{}', '{}'",
-                                name, existing, version))));
+                        Err((
+                            Blame::Human,
+                            format!(
+                                "conflicting versions for dependency '{}': '{}', '{}'",
+                                name, existing, version
+                            ),
+                        ))?;
                     }
                 }
             }
@@ -570,30 +567,39 @@ fn try_main() -> Result<i32> {
     Generate the prelude items, if we need any.  Again, ensure consistent and *valid* sorting.
     */
     let prelude_items = {
-        let unstable_features = args.unstable_features.iter()
+        let unstable_features = args
+            .unstable_features
+            .iter()
             .map(|uf| format!("#![feature({})]", uf));
-        let dep_externs = args.dep_extern.iter()
+        let dep_externs = args
+            .dep_extern
+            .iter()
             .map(|d| match d.find('=') {
                 Some(i) => &d[..i],
-                None => &d[..]
+                None => &d[..],
             })
             .map(|d| match d.contains('-') {
                 true => Cow::from(d.replace("-", "_")),
-                false => Cow::from(d)
+                false => Cow::from(d),
             })
             .map(|d| format!("#[macro_use] extern crate {};", d));
 
-        let externs = args.extern_.iter()
+        let externs = args
+            .extern_
+            .iter()
             .map(|n| format!("#[macro_use] extern crate {};", n));
 
-        let mut items: Vec<_> = unstable_features.chain(dep_externs).chain(externs).collect();
+        let mut items: Vec<_> = unstable_features
+            .chain(dep_externs)
+            .chain(externs)
+            .collect();
         items.sort();
         items
     };
     info!("prelude_items: {:?}", prelude_items);
 
     // Work out what to do.
-    let action = try!(decide_action_for(
+    let action = decide_action_for(
         &input,
         deps,
         prelude_items,
@@ -605,10 +611,10 @@ fn try_main() -> Result<i32> {
         args.features,
         args.use_bincache,
         args.build_kind,
-    ));
+    )?;
     info!("action: {:?}", action);
 
-    try!(gen_pkg_and_compile(&input, &action));
+    gen_pkg_and_compile(&input, &action)?;
 
     // Once we're done, clean out old packages from the cache.  There's no point if we've already done a full clear, though.
     let _defer_clear = {
@@ -616,7 +622,7 @@ fn try_main() -> Result<i32> {
         let cc = args.clear_cache;
         Defer::<_, MainError>::defer(move || {
             if !cc {
-                try!(clean_cache(consts::MAX_CACHE_AGE_MS));
+                clean_cache(consts::MAX_CACHE_AGE_MS)?;
             }
             Ok(())
         })
@@ -624,9 +630,14 @@ fn try_main() -> Result<i32> {
 
     // Run it!
     if action.execute {
-        fn hint<F: FnOnce(&mut Command) -> &mut Command>(f: F) -> F { f }
+        fn hint<F: FnOnce(&mut Command) -> &mut Command>(f: F) -> F {
+            f
+        }
         let add_env = hint(move |cmd| {
-            cmd.env("CARGO_SCRIPT_SCRIPT_PATH", input.path().unwrap_or(Path::new("")));
+            cmd.env(
+                "CARGO_SCRIPT_SCRIPT_PATH",
+                input.path().unwrap_or(Path::new("")),
+            );
             cmd.env("CARGO_SCRIPT_SAFE_NAME", input.safe_name());
             cmd.env("CARGO_SCRIPT_PKG_NAME", input.package_name());
             cmd.env("CARGO_SCRIPT_BASE_PATH", input.base_path());
@@ -634,26 +645,25 @@ fn try_main() -> Result<i32> {
         });
 
         if action.build_kind.can_exec_directly() {
-            let exe_path = try!(get_exe_path(action.build_kind, &action.pkg_path));
+            let exe_path = get_exe_path(action.build_kind, &action.pkg_path)?;
             info!("executing {:?}", exe_path);
-            match try!({
-                Command::new(exe_path)
-                    .args(&args.args)
-                    .chain_map(add_env)
-                    .status()
-                    .map(|st| st.code().unwrap_or(1))
-            }) {
+            match Command::new(exe_path)
+                .args(&args.args)
+                .chain_map(add_env)
+                .status()
+                .map(|st| st.code().unwrap_or(1))?
+            {
                 0 => (),
-                n => return Ok(n)
+                n => return Ok(n),
             }
         } else {
             let cmd_name = action.build_kind.exec_command();
             info!("running `cargo {}`", cmd_name);
-            let mut cmd = try!(action.cargo(cmd_name));
+            let mut cmd = action.cargo(cmd_name)?;
             add_env(&mut cmd);
-            match try!(cmd.status().map(|st| st.code().unwrap_or(1))) {
+            match cmd.status().map(|st| st.code().unwrap_or(1))? {
                 0 => (),
-                n => return Ok(n)
+                n => return Ok(n),
             }
         }
     }
@@ -672,7 +682,7 @@ fn clean_cache(max_age: u64) -> Result<()> {
 
     if max_age == 0 {
         info!("max_age is 0, clearing binary cache...");
-        let cache_dir = try!(get_binary_cache_path());
+        let cache_dir = get_binary_cache_path()?;
         if ALLOW_AUTO_REMOVE {
             if let Err(err) = fs::remove_dir_all(&cache_dir) {
                 error!("failed to remove binary cache {:?}: {}", cache_dir, err);
@@ -683,11 +693,13 @@ fn clean_cache(max_age: u64) -> Result<()> {
     let cutoff = platform::current_time() - max_age;
     info!("cutoff:     {:>20?} ms", cutoff);
 
-    let cache_dir = try!(get_script_cache_path());
-    for child in try!(fs::read_dir(cache_dir)) {
-        let child = try!(child);
+    let cache_dir = get_script_cache_path()?;
+    for child in fs::read_dir(cache_dir)? {
+        let child = child?;
         let path = child.path();
-        if path.is_file_polyfill() { continue }
+        if path.is_file_polyfill() {
+            continue;
+        }
 
         info!("checking: {:?}", path);
 
@@ -705,7 +717,7 @@ fn clean_cache(max_age: u64) -> Result<()> {
                     Ok(file) => file,
                     Err(..) => {
                         info!("couldn't open metadata for {:?}", path);
-                        return true
+                        return true;
                     }
                 };
                 platform::file_last_modified(&meta_file)
@@ -735,10 +747,7 @@ Generate and compile a package from the input.
 
 Why take `PackageMetadata`?  To ensure that any information we need to depend on for compilation *first* passes through `decide_action_for` *and* is less likely to not be serialised with the rest of the metadata.
 */
-fn gen_pkg_and_compile(
-    input: &Input,
-    action: &InputAction,
-) -> Result<()> {
+fn gen_pkg_and_compile(input: &Input<'_>, action: &InputAction) -> Result<()> {
     let pkg_path = &action.pkg_path;
     let meta = &action.metadata;
     let old_meta = action.old_metadata.as_ref();
@@ -747,13 +756,13 @@ fn gen_pkg_and_compile(
     let script_str = &action.script;
 
     info!("creating pkg dir...");
-    try!(fs::create_dir_all(pkg_path));
-    let cleanup_dir: Defer<_, MainError> = Defer::defer(|| {
+    fs::create_dir_all(pkg_path)?;
+    let cleanup_dir: Defer<'_, _, MainError> = Defer::defer(|| {
         // DO NOT try deleting ANYTHING if we're not cleaning up inside our own cache.  We *DO NOT* want to risk killing user files.
         if action.using_cache {
             info!("cleaning up cache directory {:?}", pkg_path);
             if ALLOW_AUTO_REMOVE {
-                try!(fs::remove_dir_all(pkg_path));
+                fs::remove_dir_all(pkg_path)?;
             } else {
                 info!("(suppressed remove)");
             }
@@ -767,11 +776,11 @@ fn gen_pkg_and_compile(
     let mani_path = {
         let mani_path = action.manifest_path();
         let mani_hash = old_meta.map(|m| &*m.manifest_hash);
-        match try!(overwrite_file(&mani_path, mani_str, mani_hash)) {
+        match overwrite_file(&mani_path, mani_str, mani_hash)? {
             FileOverwrite::Same => (),
             FileOverwrite::Changed { new_hash } => {
                 meta.manifest_hash = new_hash;
-            },
+            }
         }
         mani_path
     };
@@ -787,11 +796,11 @@ fn gen_pkg_and_compile(
         } else {
             old_meta.map(|m| &*m.script_hash)
         };
-        match try!(overwrite_file(&script_path, script_str, script_hash)) {
+        match overwrite_file(&script_path, script_str, script_hash)? {
             FileOverwrite::Same => (),
             FileOverwrite::Changed { new_hash } => {
                 meta.script_hash = new_hash;
-            },
+            }
         }
     }
 
@@ -806,66 +815,74 @@ fn gen_pkg_and_compile(
 
     As such, we want to ignore any compilation problems until *after* we've written the metadata and disarmed the cleanup callback.
     */
-    let mut compile_err = Ok(());
     if action.compile {
         info!("compiling...");
-        let mut cmd = try!(cargo("build", &*mani_path.to_string_lossy(), action.use_bincache, &meta));
-
-        #[cfg(feature="suppress-cargo-output")]
+        let mut cmd = cargo(
+            "build",
+            &*mani_path.to_string_lossy(),
+            action.use_bincache,
+            &meta,
+        )?;
+
+        #[cfg(feature = "suppress-cargo-output")]
         macro_rules! get_status {
             ($cmd:expr) => {
-                // `try!` doesn't work here on <=1.12.
                 (match util::suppress_child_output(
                     &mut $cmd,
-                    ::std::time::Duration::from_millis(CARGO_OUTPUT_TIMEOUT)
+                    ::std::time::Duration::from_millis(CARGO_OUTPUT_TIMEOUT),
                 ) {
                     Ok(v) => v,
                     Err(e) => return Err(e),
-                }).status()
-            }
+                })
+                .status()
+            };
         }
 
-        #[cfg(not(feature="suppress-cargo-output"))]
+        #[cfg(not(feature = "suppress-cargo-output"))]
         macro_rules! get_status {
             ($cmd:expr) => {
                 $cmd.status()
-            }
+            };
         }
 
-        compile_err = get_status!(cmd).map_err(|e| Into::<MainError>::into(e))
-            .and_then(|st|
-                match st.code() {
-                    Some(0) => Ok(()),
-                    Some(st) => Err(format!("cargo failed with status {}", st).into()),
-                    None => Err("cargo failed".into())
-                });
-
-        // Drop out now if compilation failed.
-        let _ = try!(compile_err);
+        match get_status!(cmd)
+            .map_err(|e| Into::<MainError>::into(e))?
+            .code()
+        {
+            Some(0) => (),
+            Some(st) => return Err(format!("cargo failed with status {}", st).into()),
+            None => return Err("cargo failed".into()),
+        };
 
         // Find out and cache what the executable was called.
-        let _ = try!(cargo_target(input, pkg_path, &*mani_path.to_string_lossy(), action.use_bincache, &meta));
+        let _ = cargo_target(
+            input,
+            pkg_path,
+            &*mani_path.to_string_lossy(),
+            action.use_bincache,
+            &meta,
+        )?;
 
         if action.use_bincache {
             // Write out the metadata hash to tie this executable to a particular chunk of metadata.  This is to avoid issues with multiple scripts with the same name being compiled to a common target directory.
             let meta_hash = action.metadata.sha1_hash();
             info!("writing meta hash: {:?}...", meta_hash);
-            let exe_meta_hash_path = try!(get_meta_hash_path(action.use_bincache, pkg_path));
-            let mut f = try!(fs::File::create(&exe_meta_hash_path));
-            try!(write!(&mut f, "{}", meta_hash));
+            let exe_meta_hash_path = get_meta_hash_path(action.use_bincache, pkg_path)?;
+            let mut f = fs::File::create(&exe_meta_hash_path)?;
+            write!(&mut f, "{}", meta_hash)?;
         }
     }
 
     // Write out metadata *now*.  Remember that we check the timestamp in the metadata, *not* on the executable.
     if action.emit_metadata {
         info!("emitting metadata...");
-        try!(write_pkg_metadata(pkg_path, &meta));
+        write_pkg_metadata(pkg_path, &meta)?;
     }
 
     info!("disarming pkg dir cleanup...");
     cleanup_dir.disarm();
 
-    compile_err
+    Ok(())
 }
 
 /**
@@ -924,7 +941,12 @@ impl InputAction {
     }
 
     fn cargo(&self, cmd: &str) -> Result<Command> {
-        cargo(cmd, &*self.manifest_path().to_string_lossy(), self.use_bincache, &self.metadata)
+        cargo(
+            cmd,
+            &*self.manifest_path().to_string_lossy(),
+            self.use_bincache,
+            &self.metadata,
+        )
     }
 }
 
@@ -934,7 +956,7 @@ The metadata here serves two purposes:
 1. It records everything necessary for compilation and execution of a package.
 2. It records everything that must be exactly the same in order for a cached executable to still be valid, in addition to the content hash.
 */
-#[derive(Clone, Debug, Eq, PartialEq, RustcDecodable, RustcEncodable)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 struct PackageMetadata {
     /// Path to the script file.
     path: Option<String>,
@@ -975,7 +997,7 @@ impl PackageMetadata {
 For the given input, this constructs the package metadata and checks the cache to see what should be done.
 */
 fn decide_action_for(
-    input: &Input,
+    input: &Input<'_>,
     deps: Vec<(String, String)>,
     prelude: Vec<String>,
     debug: bool,
@@ -987,28 +1009,26 @@ fn decide_action_for(
     use_bincache: Option<bool>,
     build_kind: BuildKind,
 ) -> Result<InputAction> {
-    let (pkg_path, using_cache) = pkg_path.map(|p| (p.into(), false))
-        .unwrap_or_else(|| {
-            // This can't fail.  Seriously, we're *fucked* if we can't work this out.
-            let cache_path = get_script_cache_path().unwrap();
-            info!("cache_path: {:?}", cache_path);
-
-            let id = {
-                let deps_iter = deps.iter()
-                    .map(|&(ref n, ref v)| (n as &str, v as &str));
-
-                // Again, also fucked if we can't work this out.
-                input.compute_id(deps_iter).unwrap()
-            };
-            info!("id: {:?}", id);
+    let (pkg_path, using_cache) = pkg_path.map(|p| (p.into(), false)).unwrap_or_else(|| {
+        // This can't fail.  Seriously, we're *fucked* if we can't work this out.
+        let cache_path = get_script_cache_path().unwrap();
+        info!("cache_path: {:?}", cache_path);
 
-            (cache_path.join(&id), true)
-        });
+        let id = {
+            let deps_iter = deps.iter().map(|&(ref n, ref v)| (n as &str, v as &str));
+
+            // Again, also fucked if we can't work this out.
+            input.compute_id(deps_iter).unwrap()
+        };
+        info!("id: {:?}", id);
+
+        (cache_path.join(&id), true)
+    });
     info!("pkg_path: {:?}", pkg_path);
     info!("using_cache: {:?}", using_cache);
 
     info!("splitting input...");
-    let (mani_str, script_str) = try!(manifest::split_input(input, &deps, &prelude));
+    let (mani_str, script_str) = manifest::split_input(input, &deps, &prelude)?;
 
     // Forcibly override some flags based on build kind.
     let (debug, force, build_only) = match build_kind {
@@ -1020,12 +1040,11 @@ fn decide_action_for(
     // Construct input metadata.
     let input_meta = {
         let (path, mtime, template) = match *input {
-            Input::File(_, path, _, mtime)
-                => (Some(path.to_string_lossy().into_owned()), Some(mtime), None),
-            Input::Expr(_, template)
-                => (None, None, template),
-            Input::Loop(..)
-                => (None, None, None)
+            Input::File(_, path, _, mtime) => {
+                (Some(path.to_string_lossy().into_owned()), Some(mtime), None)
+            }
+            Input::Expr(_, template) => (None, None, template),
+            Input::Loop(..) => (None, None, None),
         };
         PackageMetadata {
             path: path,
@@ -1122,9 +1141,9 @@ fn decide_action_for(
             bail!(compile: true, force_compile: true)
         }
         let exe_meta_hash = {
-            let mut f = try!(fs::File::open(&exe_meta_hash_path));
+            let mut f = fs::File::open(&exe_meta_hash_path)?;
             let mut s = String::new();
-            try!(f.read_to_string(&mut s));
+            f.read_to_string(&mut s)?;
             s
         };
         let meta_hash = action.metadata.sha1_hash();
@@ -1144,7 +1163,9 @@ Figures out where the output executable for the input should be.
 This *requires* that `cargo_target` has already been called on the package.
 */
 fn get_exe_path<P>(build_kind: BuildKind, pkg_path: P) -> Result<PathBuf>
-where P: AsRef<Path> {
+where
+    P: AsRef<Path>,
+{
     use std::fs::File;
 
     // We don't directly run tests and benchmarks.
@@ -1152,14 +1173,14 @@ where P: AsRef<Path> {
         BuildKind::Normal => (),
         BuildKind::Test | BuildKind::Bench => {
             return Err("tried to get executable path for test/bench build".into());
-        },
+        }
     }
 
     let package_path = pkg_path.as_ref();
     let cache_path = package_path.join("target.exe_path");
 
-    let mut f = try!(File::open(&cache_path));
-    let exe_path = try!(platform::read_path(&mut f));
+    let mut f = File::open(&cache_path)?;
+    let exe_path = platform::read_path(&mut f)?;
 
     Ok(exe_path)
 }
@@ -1168,7 +1189,9 @@ where P: AsRef<Path> {
 Figures out where the `meta-hash` file should be.
 */
 fn get_meta_hash_path<P>(use_bincache: bool, pkg_path: P) -> Result<PathBuf>
-where P: AsRef<Path> {
+where
+    P: AsRef<Path>,
+{
     if !use_bincache {
         panic!("tried to get meta-hash path when not using binary cache");
     }
@@ -1179,18 +1202,20 @@ where P: AsRef<Path> {
 Load the package metadata, given the path to the package's cache folder.
 */
 fn get_pkg_metadata<P>(pkg_path: P) -> Result<PackageMetadata>
-where P: AsRef<Path> {
+where
+    P: AsRef<Path>,
+{
     let meta_path = get_pkg_metadata_path(pkg_path);
     debug!("meta_path: {:?}", meta_path);
-    let mut meta_file = try!(fs::File::open(&meta_path));
+    let mut meta_file = fs::File::open(&meta_path)?;
 
     let meta_str = {
         let mut s = String::new();
         meta_file.read_to_string(&mut s).unwrap();
         s
     };
-    let meta: PackageMetadata = try!(rustc_serialize::json::decode(&meta_str)
-        .map_err(|err| err.to_string()));
+    let meta: PackageMetadata =
+        serde_json::from_str(&meta_str).map_err(|err| err.to_string())?;
 
     Ok(meta)
 }
@@ -1199,7 +1224,9 @@ where P: AsRef<Path> {
 Work out the path to a package's metadata file.
 */
 fn get_pkg_metadata_path<P>(pkg_path: P) -> PathBuf
-where P: AsRef<Path> {
+where
+    P: AsRef<Path>,
+{
     pkg_path.as_ref().join(consts::METADATA_FILE)
 }
 
@@ -1207,14 +1234,15 @@ where P: AsRef<Path> {
 Save the package metadata, given the path to the package's cache folder.
 */
 fn write_pkg_metadata<P>(pkg_path: P, meta: &PackageMetadata) -> Result<()>
-where P: AsRef<Path> {
+where
+    P: AsRef<Path>,
+{
     let meta_path = get_pkg_metadata_path(pkg_path);
     debug!("meta_path: {:?}", meta_path);
-    let mut meta_file = try!(fs::File::create(&meta_path));
-    let meta_str = try!(rustc_serialize::json::encode(meta)
-        .map_err(|err| err.to_string()));
-    try!(write!(&mut meta_file, "{}", meta_str));
-    try!(meta_file.flush());
+    let mut meta_file = fs::File::create(&meta_path)?;
+    let meta_str = serde_json::to_string(meta).map_err(|err| err.to_string())?;
+    write!(&mut meta_file, "{}", meta_str)?;
+    meta_file.flush()?;
     Ok(())
 }
 
@@ -1222,7 +1250,7 @@ where P: AsRef<Path> {
 Returns the path to the cache directory.
 */
 fn get_script_cache_path() -> Result<PathBuf> {
-    let cache_path = try!(platform::get_cache_dir());
+    let cache_path = platform::get_cache_dir()?;
     Ok(cache_path.join("script-cache"))
 }
 
@@ -1230,7 +1258,7 @@ fn get_script_cache_path() -> Result<PathBuf> {
 Returns the path to the binary cache directory.
 */
 fn get_binary_cache_path() -> Result<PathBuf> {
-    let cache_path = try!(platform::get_cache_dir());
+    let cache_path = platform::get_cache_dir()?;
     Ok(cache_path.join("binary-cache"))
 }
 
@@ -1238,7 +1266,9 @@ fn get_binary_cache_path() -> Result<PathBuf> {
 Attempts to locate the script specified by the given path.  If the path as-given doesn't yield anything, it will try adding file extensions.
 */
 fn find_script<P>(path: P) -> Option<(PathBuf, fs::File)>
-where P: AsRef<Path> {
+where
+    P: AsRef<Path>,
+{
     let path = path.as_ref();
 
     // Try the path directly.
@@ -1295,7 +1325,7 @@ impl<'a> Input<'a> {
     Return the path to the script, if it has one.
     */
     pub fn path(&self) -> Option<&Path> {
-        use Input::*;
+        use crate::Input::*;
 
         match *self {
             File(_, path, _, _) => Some(path),
@@ -1310,7 +1340,7 @@ impl<'a> Input<'a> {
     Currently, nothing is done to ensure this, other than hoping *really hard* that we don't get fed some excessively bizzare input filename.
     */
     pub fn safe_name(&self) -> &str {
-        use Input::*;
+        use crate::Input::*;
 
         match *self {
             File(name, _, _, _) => name,
@@ -1328,18 +1358,13 @@ impl<'a> Input<'a> {
 
         for (i, c) in name.chars().enumerate() {
             match (i, c) {
-                (0, '0'...'9') => {
+                (0, '0'..='9') => {
                     r.push('_');
                     r.push(c);
-                },
-                (_, '0'...'9')
-                | (_, 'a'...'z')
-                | (_, 'A'...'Z')
-                | (_, '_')
-                | (_, '-')
-                => {
+                }
+                (_, '0'..='9') | (_, 'a'..='z') | (_, 'A'..='Z') | (_, '_') | (_, '-') => {
                     r.push(c);
-                },
+                }
                 (_, _) => {
                     r.push('_');
                 }
@@ -1354,8 +1379,13 @@ impl<'a> Input<'a> {
     */
     pub fn base_path(&self) -> PathBuf {
         match *self {
-            Input::File(_, path, _, _) => path.parent().expect("couldn't get parent directory for file input base path").into(),
-            Input::Expr(..) | Input::Loop(..) => std::env::current_dir().expect("couldn't get current directory for input base path"),
+            Input::File(_, path, _, _) => path
+                .parent()
+                .expect("couldn't get parent directory for file input base path")
+                .into(),
+            Input::Expr(..) | Input::Loop(..) => {
+                std::env::current_dir().expect("couldn't get current directory for input base path")
+            }
         }
     }
 
@@ -1363,10 +1393,12 @@ impl<'a> Input<'a> {
     Compute the package ID for the input.  This is used as the name of the cache folder into which the Cargo package will be generated.
     */
     pub fn compute_id<'dep, DepIt>(&self, deps: DepIt) -> Result<OsString>
-    where DepIt: IntoIterator<Item=(&'dep str, &'dep str)> {
+    where
+        DepIt: IntoIterator<Item = (&'dep str, &'dep str)>,
+    {
+        use crate::Input::*;
         use shaman::digest::Digest;
         use shaman::sha1::Sha1;
-        use Input::*;
 
         let hash_deps = || {
             let mut hasher = Sha1::new();
@@ -1395,7 +1427,7 @@ impl<'a> Input<'a> {
                 id.push("-");
                 id.push(if STUB_HASHES { "stub" } else { &*digest });
                 Ok(id)
-            },
+            }
             Expr(content, template) => {
                 let mut hasher = hash_deps();
 
@@ -1411,7 +1443,7 @@ impl<'a> Input<'a> {
                 id.push("expr-");
                 id.push(if STUB_HASHES { "stub" } else { &*digest });
                 Ok(id)
-            },
+            }
             Loop(content, count) => {
                 let mut hasher = hash_deps();
 
@@ -1427,7 +1459,7 @@ impl<'a> Input<'a> {
                 id.push("loop-");
                 id.push(if STUB_HASHES { "stub" } else { &*digest });
                 Ok(id)
-            },
+            }
         }
     }
 }
@@ -1452,7 +1484,9 @@ enum FileOverwrite {
 Overwrite a file if and only if the contents have changed.
 */
 fn overwrite_file<P>(path: P, content: &str, hash: Option<&str>) -> Result<FileOverwrite>
-where P: AsRef<Path> {
+where
+    P: AsRef<Path>,
+{
     debug!("overwrite_file({:?}, _, {:?})", path.as_ref(), hash);
     let new_hash = hash_str(content);
     if Some(&*new_hash) == hash {
@@ -1461,26 +1495,30 @@ where P: AsRef<Path> {
     }
 
     debug!(".. hashes differ; new_hash: {:?}", new_hash);
-    let mut file = try!(fs::File::create(path));
-    try!(write!(&mut file, "{}", content));
-    try!(file.flush());
+    let mut file = fs::File::create(path)?;
+    write!(&mut file, "{}", content)?;
+    file.flush()?;
     Ok(FileOverwrite::Changed { new_hash: new_hash })
 }
 
 /**
 Constructs a Cargo command that runs on the script package.
 */
-fn cargo(cmd_name: &str, manifest: &str, use_bincache: bool, meta: &PackageMetadata) -> Result<Command> {
+fn cargo(
+    cmd_name: &str,
+    manifest: &str,
+    use_bincache: bool,
+    meta: &PackageMetadata,
+) -> Result<Command> {
     let mut cmd = Command::new("cargo");
-    cmd.arg(cmd_name)
-        .arg("--manifest-path").arg(manifest);
+    cmd.arg(cmd_name).arg("--manifest-path").arg(manifest);
 
     if platform::force_cargo_color() {
         cmd.arg("--color").arg("always");
     }
 
     if use_bincache {
-        cmd.env("CARGO_TARGET_DIR", try!(get_binary_cache_path()));
+        cmd.env("CARGO_TARGET_DIR", get_binary_cache_path()?);
     }
 
     // Block `--release` on `bench`.
@@ -1500,16 +1538,28 @@ Tries to find the path to a package's target file.
 
 This will also cache this information such that `exe_path` can find it later.
 */
-fn cargo_target<P>(input: &Input, pkg_path: P, manifest: &str, use_bincache: bool, meta: &PackageMetadata) -> Result<PathBuf>
-where P: AsRef<Path> {
+fn cargo_target<P>(
+    input: &Input<'_>,
+    pkg_path: P,
+    manifest: &str,
+    use_bincache: bool,
+    meta: &PackageMetadata,
+) -> Result<PathBuf>
+where
+    P: AsRef<Path>,
+{
     lazy_static! {
         static ref VER_JSON_MSGS: Version = Version::parse("0.18.0").unwrap();
     }
 
-    trace!("cargo_target(_, {:?}, {:?}, {:?}, _)", pkg_path.as_ref(), manifest, use_bincache);
+    trace!(
+        "cargo_target(_, {:?}, {:?}, {:?}, _)",
+        pkg_path.as_ref(),
+        manifest,
+        use_bincache
+    );
 
-    let cargo_ver = try!(cargo_version()
-        .err_tag("could not determine target filename"));
+    let cargo_ver = cargo_version().err_tag("could not determine target filename")?;
 
     let mut use_guess = false;
     use_guess |= work_around_issue_50();
@@ -1521,9 +1571,9 @@ where P: AsRef<Path> {
     };
 
     let exe_path = if use_guess {
-        try!(cargo_target_by_guess(input, use_bincache, pkg_path.as_ref(), meta))
+        cargo_target_by_guess(input, use_bincache, pkg_path.as_ref(), meta)?
     } else {
-        try!(cargo_target_by_message(input, manifest, use_bincache, meta))
+        cargo_target_by_message(input, manifest, use_bincache, meta)?
     };
 
     trace!(".. exe_path: {:?}", exe_path);
@@ -1536,8 +1586,8 @@ where P: AsRef<Path> {
         let package_path = manifest_path.parent().unwrap();
         let cache_path = package_path.join("target.exe_path");
 
-        let mut f = try!(File::create(&cache_path));
-        try!(platform::write_path(&mut f, &exe_path));
+        let mut f = File::create(&cache_path)?;
+        platform::write_path(&mut f, &exe_path)?;
     }
 
     Ok(exe_path)
@@ -1548,19 +1598,31 @@ Figures out where the output executable for the input should be by guessing.
 
 Depending on the configuration, this might not work.  On the other hand, this actually works (usually) prior to Cargo 0.18 (Rust 1.17).
 */
-fn cargo_target_by_guess(input: &Input, use_bincache: bool, pkg_path: &Path, meta: &PackageMetadata) -> Result<PathBuf> {
-    trace!("cargo_target_by_guess(_, {:?}, {:?}, _)", use_bincache, pkg_path);
+fn cargo_target_by_guess(
+    input: &Input<'_>,
+    use_bincache: bool,
+    pkg_path: &Path,
+    meta: &PackageMetadata,
+) -> Result<PathBuf> {
+    trace!(
+        "cargo_target_by_guess(_, {:?}, {:?}, _)",
+        use_bincache,
+        pkg_path
+    );
 
     let profile = match meta.debug {
         true => "debug",
-        false => "release"
+        false => "release",
     };
     let target_path = if use_bincache {
-        try!(get_binary_cache_path())
+        get_binary_cache_path()?
     } else {
         pkg_path.join("target")
     };
-    let mut exe_path = target_path.join(profile).join(&input.package_name()).into_os_string();
+    let mut exe_path = target_path
+        .join(profile)
+        .join(&input.package_name())
+        .into_os_string();
     exe_path.push(std::env::consts::EXE_SUFFIX);
     Ok(exe_path.into())
 }
@@ -1570,61 +1632,90 @@ Gets the path to the package's target file by parsing the output of `cargo build
 
 This only works on Cargo 0.18 (Rust 1.17) and higher.
 */
-fn cargo_target_by_message(input: &Input, manifest: &str, use_bincache: bool, meta: &PackageMetadata) -> Result<PathBuf> {
+fn cargo_target_by_message(
+    input: &Input<'_>,
+    manifest: &str,
+    use_bincache: bool,
+    meta: &PackageMetadata,
+) -> Result<PathBuf> {
     use std::io::{BufRead, BufReader};
-    use rustc_serialize::json;
+    use std::str::FromStr;
 
-    trace!("cargo_target_by_message(_, {:?}, {:?}, _)", manifest, use_bincache);
+    trace!(
+        "cargo_target_by_message(_, {:?}, {:?}, _)",
+        manifest,
+        use_bincache
+    );
 
-    let mut cmd = try!(cargo("build", manifest, use_bincache, meta));
+    let mut cmd = cargo("build", manifest, use_bincache, meta)?;
     cmd.arg("--message-format=json");
     cmd.stdout(process::Stdio::piped());
     cmd.stderr(process::Stdio::null());
 
     trace!(".. cmd: {:?}", cmd);
 
-    let mut child = try!(cmd.spawn());
-    match try!(child.wait()).code() {
+    let mut child = cmd.spawn()?;
+    match child.wait()?.code() {
         Some(0) => (),
-        Some(st) => return Err(format!("could not determine target filename: cargo exited with status {}", st).into()),
-        None => return Err(format!("could not determine target filename: cargo exited abnormally").into()),
+        Some(st) => {
+            return Err(format!(
+                "could not determine target filename: cargo exited with status {}",
+                st
+            )
+            .into());
+        }
+        None => {
+            return Err(
+                format!("could not determine target filename: cargo exited abnormally").into(),
+            );
+        }
     }
 
     let mut line = String::with_capacity(1024);
     let mut stdout = BufReader::new(child.stdout.take().unwrap());
-    let null = json::Json::Null;
+    let null = serde_json::Value::Null;
     let package_name = input.package_name();
 
     let mut line_num = 0;
     loop {
         line_num += 1;
         line.clear();
-        let bytes = try!(stdout.read_line(&mut line));
+        let bytes = stdout.read_line(&mut line)?;
         trace!(".. line {}, {}b: {:?}", line_num, bytes, line);
         if bytes == 0 {
-            return Err("could not determine target filename: did not find appropriate cargo message".into());
+            return Err(
+                "could not determine target filename: did not find appropriate cargo message"
+                    .into(),
+            );
         }
 
-        let msg = try!(json::Json::from_str(line.trim())
-            .map_err(Box::new));
+        let msg = serde_json::Value::from_str(line.trim()).map_err(Box::new)?;
 
         // Is this the message we're looking for?
-        if msg.find("reason").unwrap_or(&null).as_string() != Some("compiler-artifact") {
+        if msg.get("reason").unwrap_or(&null).as_str() != Some("compiler-artifact") {
             trace!("   couldn't find `compiler-artifact`");
             continue;
         }
-        if msg.find_path(&["target", "name"]).unwrap_or(&null).as_string() != Some(&package_name) {
-            trace!("   couldn't find `target.name`, or it wasn't {:?}", package_name);
+        if msg
+            .pointer("/target/name")
+            .unwrap_or(&null)
+            .as_str()
+            != Some(&package_name)
+        {
+            trace!(
+                "   couldn't find `target.name`, or it wasn't {:?}",
+                package_name
+            );
             continue;
         }
 
         // Looks like it; grab the path.
-        let exe_path = msg.find_path(&["filenames"])
+        let exe_path = msg
+            .get("filenames")
             .expect("could not find `filenames` in json message")
             .as_array()
-            .expect("`filenames` in json message was not an array")
-            [0]
-            .as_string()
+            .expect("`filenames` in json message was not an array")[0]
+            .as_str()
             .expect("`filenames[0]` in json message was not a string");
 
         return Ok(exe_path.into());
@@ -1644,22 +1735,35 @@ fn cargo_version() -> Result<Version> {
     let mut cmd = Command::new("cargo");
     cmd.arg("-V");
 
-    let child = try!(cmd.output());
+    let child = cmd.output()?;
     match child.status.code() {
         Some(0) => (),
-        Some(st) => return Err(format!("could not determine cargo version: cargo exited with status {}", st).into()),
-        None => return Err(format!("could not determine cargo version: cargo exited abnormally").into()),
+        Some(st) => {
+            return Err(format!(
+                "could not determine cargo version: cargo exited with status {}",
+                st
+            )
+            .into());
+        }
+        None => {
+            return Err(
+                format!("could not determine cargo version: cargo exited abnormally").into(),
+            );
+        }
     }
 
     let stdout = String::from_utf8_lossy(&child.stdout);
     let m = match RE_VERSION.captures(&stdout) {
         Some(m) => m,
-        None => return Err(format!("could not determine cargo version: output did not match expected").into()),
+        None => {
+            return Err(
+                format!("could not determine cargo version: output did not match expected").into(),
+            );
+        }
     };
 
     let ver = m.get(1).unwrap();
-    Ok(try!(Version::parse(ver.as_str())
-        .map_err(Box::new)))
+    Ok(Version::parse(ver.as_str()).map_err(Box::new)?)
 }
 
 /**
@@ -1671,8 +1775,14 @@ fn work_around_issue_50() -> bool {
     let suffers = cfg!(issue_50);
     let ignored = std::env::var_os("CARGO_SCRIPT_IGNORE_ISSUE_50").is_some();
     match (suffers, ignored) {
-        (true, true) => { trace!(".. issue 50 relevant, but ignored"); false },
-        (true, false) => { trace!(".. working around issue 50"); true },
-        (false, _) => { false },
+        (true, true) => {
+            trace!(".. issue 50 relevant, but ignored");
+            false
+        }
+        (true, false) => {
+            trace!(".. working around issue 50");
+            true
+        }
+        (false, _) => false,
     }
 }
diff --git a/src/manifest.rs b/src/manifest.rs
index 42628b8d..0ed9c120 100644
--- a/src/manifest.rs
+++ b/src/manifest.rs
@@ -10,22 +10,19 @@ or distributed except according to those terms.
 /*!
 This module is concerned with how `cargo-script` extracts the manfiest from a script file.
 */
-extern crate hoedown;
-extern crate regex;
-
+use crate::consts;
+use crate::error::{Blame, MainError, Result};
+use crate::templates;
+use crate::Input;
+use lazy_static::lazy_static;
+use log::{error, info};
+use regex::Regex;
 use std::collections::HashMap;
 use std::path::Path;
-use self::regex::Regex;
-use toml;
-
-use consts;
-use error::{Blame, Result};
-use templates;
-use Input;
 
 lazy_static! {
-    static ref RE_SHORT_MANIFEST: Regex = Regex::new(
-        r"^(?i)\s*//\s*cargo-deps\s*:(.*?)(\r\n|\n)").unwrap();
+    static ref RE_SHORT_MANIFEST: Regex =
+        Regex::new(r"^(?i)\s*//\s*cargo-deps\s*:(.*?)(\r\n|\n)").unwrap();
     static ref RE_MARGIN: Regex = Regex::new(r"^\s*\*( |$)").unwrap();
     static ref RE_SPACE: Regex = Regex::new(r"^(\s+)").unwrap();
     static ref RE_NESTING: Regex = Regex::new(r"/\*|\*/").unwrap();
@@ -47,33 +44,45 @@ Splits input into a complete Cargo manifest and unadultered Rust source.
 
 Unless we have prelude items to inject, in which case it will be *slightly* adulterated.
 */
-pub fn split_input(input: &Input, deps: &[(String, String)], prelude_items: &[String]) -> Result<(String, String)> {
+pub fn split_input(
+    input: &Input<'_>,
+    deps: &[(String, String)],
+    prelude_items: &[String],
+) -> Result<(String, String)> {
     let template_buf;
     let (part_mani, source, template, sub_prelude) = match *input {
         Input::File(_, _, content, _) => {
             assert_eq!(prelude_items.len(), 0);
             let content = strip_hashbang(content);
-            let (manifest, source) = find_embedded_manifest(content)
-                .unwrap_or((Manifest::Toml(""), content));
+            let (manifest, source) =
+                find_embedded_manifest(content).unwrap_or((Manifest::Toml(""), content));
 
-            (manifest, source, try!(templates::get_template("file")), false)
-        },
-        Input::Expr("meaning-of-life", None) | Input::Expr("meaning_of_life", None) => {
-            (Manifest::Toml(""), r#"
+            (manifest, source, templates::get_template("file")?, false)
+        }
+        Input::Expr("meaning-of-life", None) | Input::Expr("meaning_of_life", None) => (
+            Manifest::Toml(""),
+            r#"
                 println!("42");
                 std::process::exit(42);
-            "#, try!(templates::get_template("expr")), true)
-        },
+            "#,
+            templates::get_template("expr")?,
+            true,
+        ),
         Input::Expr(content, template) => {
-            template_buf = try!(templates::get_template(template.unwrap_or("expr")));
+            template_buf = templates::get_template(template.unwrap_or("expr"))?;
             let (manifest, template_src) = find_embedded_manifest(&template_buf)
                 .unwrap_or((Manifest::Toml(""), &template_buf));
             (manifest, content, template_src.into(), true)
-        },
+        }
         Input::Loop(content, count) => {
             let templ = if count { "loop-count" } else { "loop" };
-            (Manifest::Toml(""), content, try!(templates::get_template(templ)), true)
-        },
+            (
+                Manifest::Toml(""),
+                content,
+                templates::get_template(templ)?,
+                true,
+            )
+        }
     };
 
     let mut prelude_str;
@@ -81,10 +90,8 @@ pub fn split_input(input: &Input, deps: &[(String, String)], prelude_items: &[St
     subs.insert(consts::SCRIPT_BODY_SUB, &source[..]);
 
     if sub_prelude {
-        prelude_str = String::with_capacity(prelude_items
-            .iter()
-            .map(|i| i.len() + 1)
-            .sum::<usize>());
+        prelude_str =
+            String::with_capacity(prelude_items.iter().map(|i| i.len() + 1).sum::<usize>());
         for i in prelude_items {
             prelude_str.push_str(i);
             prelude_str.push_str("\n");
@@ -92,23 +99,23 @@ pub fn split_input(input: &Input, deps: &[(String, String)], prelude_items: &[St
         subs.insert(consts::SCRIPT_PRELUDE_SUB, &prelude_str[..]);
     }
 
-    let source = try!(templates::expand(&template, &subs));
+    let source = templates::expand(&template, &subs)?;
 
     info!("part_mani: {:?}", part_mani);
     info!("source: {:?}", source);
 
-    let part_mani = try!(part_mani.into_toml());
+    let part_mani = part_mani.into_toml()?;
     info!("part_mani: {:?}", part_mani);
 
     // It's-a mergin' time!
-    let def_mani = try!(default_manifest(input));
-    let dep_mani = try!(deps_manifest(deps));
+    let def_mani = default_manifest(input)?;
+    let dep_mani = deps_manifest(deps)?;
 
-    let mani = try!(merge_manifest(def_mani, part_mani));
-    let mani = try!(merge_manifest(mani, dep_mani));
+    let mani = merge_manifest(def_mani, part_mani)?;
+    let mani = merge_manifest(mani, dep_mani)?;
 
     // Fix up relative paths.
-    let mani = try!(fix_manifest_paths(mani, &input.base_path()));
+    let mani = fix_manifest_paths(mani, &input.base_path())?;
     info!("mani: {:?}", mani);
 
     let mani_str = format!("{}", toml::Value::Table(mani));
@@ -120,7 +127,9 @@ pub fn split_input(input: &Input, deps: &[(String, String)], prelude_items: &[St
 #[test]
 fn test_split_input() {
     macro_rules! si {
-        ($i:expr) => (split_input(&$i, &[], &[]).ok())
+        ($i:expr) => {
+            split_input(&$i, &[], &[]).ok()
+        };
     }
 
     let dummy_path: ::std::path::PathBuf = "p".into();
@@ -128,14 +137,15 @@ fn test_split_input() {
     let f = |c| Input::File("n", &dummy_path, c, 0);
 
     macro_rules! r {
-        ($m:expr, $r:expr) => (Some(($m.into(), $r.into())));
+        ($m:expr, $r:expr) => {
+            Some(($m.into(), $r.into()))
+        };
     }
 
-    assert_eq!(si!(f(
-r#"fn main() {}"#
-        )),
+    assert_eq!(
+        si!(f(r#"fn main() {}"#)),
         r!(
-r#"[[bin]]
+            r#"[[bin]]
 name = "n"
 path = "n.rs"
 
@@ -146,19 +156,18 @@ authors = ["Anonymous"]
 name = "n"
 version = "0.1.0"
 "#,
-r#"fn main() {}"#
+            r#"fn main() {}"#
         )
     );
 
     // Ensure removed prefix manifests don't work.
-    assert_eq!(si!(f(
-r#"
+    assert_eq!(
+        si!(f(r#"
 ---
 fn main() {}
-"#
-        )),
+"#)),
         r!(
-r#"[[bin]]
+            r#"[[bin]]
 name = "n"
 path = "n.rs"
 
@@ -169,22 +178,21 @@ authors = ["Anonymous"]
 name = "n"
 version = "0.1.0"
 "#,
-r#"
+            r#"
 ---
 fn main() {}
 "#
         )
     );
 
-    assert_eq!(si!(f(
-r#"[dependencies]
+    assert_eq!(
+        si!(f(r#"[dependencies]
 time="0.1.25"
 ---
 fn main() {}
-"#
-        )),
+"#)),
         r!(
-r#"[[bin]]
+            r#"[[bin]]
 name = "n"
 path = "n.rs"
 
@@ -195,7 +203,7 @@ authors = ["Anonymous"]
 name = "n"
 version = "0.1.0"
 "#,
-r#"[dependencies]
+            r#"[dependencies]
 time="0.1.25"
 ---
 fn main() {}
@@ -203,14 +211,13 @@ fn main() {}
         )
     );
 
-    assert_eq!(si!(f(
-r#"
+    assert_eq!(
+        si!(f(r#"
 // Cargo-Deps: time="0.1.25"
 fn main() {}
-"#
-        )),
+"#)),
         r!(
-r#"[[bin]]
+            r#"[[bin]]
 name = "n"
 path = "n.rs"
 
@@ -222,21 +229,20 @@ authors = ["Anonymous"]
 name = "n"
 version = "0.1.0"
 "#,
-r#"
+            r#"
 // Cargo-Deps: time="0.1.25"
 fn main() {}
 "#
         )
     );
 
-    assert_eq!(si!(f(
-r#"
+    assert_eq!(
+        si!(f(r#"
 // Cargo-Deps: time="0.1.25", libc="0.2.5"
 fn main() {}
-"#
-        )),
+"#)),
         r!(
-r#"[[bin]]
+            r#"[[bin]]
 name = "n"
 path = "n.rs"
 
@@ -249,15 +255,15 @@ authors = ["Anonymous"]
 name = "n"
 version = "0.1.0"
 "#,
-r#"
+            r#"
 // Cargo-Deps: time="0.1.25", libc="0.2.5"
 fn main() {}
 "#
         )
     );
 
-    assert_eq!(si!(f(
-r#"
+    assert_eq!(
+        si!(f(r#"
 /*!
 Here is a manifest:
 
@@ -267,10 +273,9 @@ time = "0.1.25"
 ```
 */
 fn main() {}
-"#
-        )),
+"#)),
         r!(
-r#"[[bin]]
+            r#"[[bin]]
 name = "n"
 path = "n.rs"
 
@@ -282,7 +287,7 @@ authors = ["Anonymous"]
 name = "n"
 version = "0.1.0"
 "#,
-r#"
+            r#"
 /*!
 Here is a manifest:
 
@@ -303,29 +308,39 @@ Returns a slice of the input string with the leading hashbang, if there is one,
 fn strip_hashbang(s: &str) -> &str {
     match RE_HASHBANG.find(s) {
         Some(m) => &s[m.end()..],
-        None => s
+        None => s,
     }
 }
 
 #[test]
 fn test_strip_hashbang() {
-    assert_eq!(strip_hashbang("\
+    assert_eq!(
+        strip_hashbang(
+            "\
 #!/usr/bin/env run-cargo-script
 and the rest
 \
-        "), "\
+        "
+        ),
+        "\
 and the rest
 \
-        ");
-    assert_eq!(strip_hashbang("\
+        "
+    );
+    assert_eq!(
+        strip_hashbang(
+            "\
 #![thingy]
 and the rest
 \
-        "), "\
+        "
+        ),
+        "\
 #![thingy]
 and the rest
 \
-        ");
+        "
+    );
 }
 
 /**
@@ -343,18 +358,23 @@ enum Manifest<'s> {
 }
 
 impl<'s> Manifest<'s> {
-    pub fn into_toml(self) -> Result<toml::Table> {
+    pub fn into_toml(self) -> Result<toml::value::Table> {
         use self::Manifest::*;
         match self {
-            Toml(s) => Ok(try!(toml::Parser::new(s).parse()
-                .ok_or("could not parse embedded manifest"))),
-            TomlOwned(ref s) => Ok(try!(toml::Parser::new(s).parse()
-                .ok_or("could not parse embedded manifest"))),
+            Toml(s) => toml::from_str(s),
+            TomlOwned(ref s) => toml::from_str(&s),
             DepList(s) => Manifest::dep_list_to_toml(s),
         }
+        .map_err(|e| {
+            MainError::Tag(
+                Blame::Human,
+                "could not parse embedded manifest".into(),
+                Box::new(MainError::Other(Blame::Internal, Box::new(e))),
+            )
+        })
     }
 
-    fn dep_list_to_toml(s: &str) -> Result<toml::Table> {
+    fn dep_list_to_toml(s: &str) -> ::std::result::Result<toml::value::Table, toml::de::Error> {
         let mut r = String::new();
         r.push_str("[dependencies]\n");
         for dep in s.trim().split(',') {
@@ -363,7 +383,7 @@ impl<'s> Manifest<'s> {
                 true => {
                     r.push_str(dep);
                     r.push_str("\n");
-                },
+                }
                 false => {
                     r.push_str(dep);
                     r.push_str("=\"*\"\n");
@@ -371,8 +391,7 @@ impl<'s> Manifest<'s> {
             }
         }
 
-        Ok(try!(toml::Parser::new(&r).parse()
-            .ok_or("could not parse embedded manifest")))
+        toml::from_str(&r)
     }
 }
 
@@ -381,9 +400,8 @@ Locates a manifest embedded in Rust source.
 
 Returns `Some((manifest, source))` if it finds a manifest, `None` otherwise.
 */
-fn find_embedded_manifest(s: &str) -> Option<(Manifest, &str)> {
-    find_short_comment_manifest(s)
-        .or_else(|| find_code_block_manifest(s))
+fn find_embedded_manifest(s: &str) -> Option<(Manifest<'_>, &str)> {
+    find_short_comment_manifest(s).or_else(|| find_code_block_manifest(s))
 }
 
 #[test]
@@ -394,125 +412,140 @@ fn test_find_embedded_manifest() {
 
     assert_eq!(fem("fn main() {}"), None);
 
-    assert_eq!(fem(
-"
+    assert_eq!(
+        fem("
 fn main() {}
 "),
-    None);
+        None
+    );
 
     // Ensure removed prefix manifests don't work.
-    assert_eq!(fem(
-r#"
+    assert_eq!(
+        fem(r#"
 ---
 fn main() {}
 "#),
-    None);
+        None
+    );
 
-    assert_eq!(fem(
-"[dependencies]
+    assert_eq!(
+        fem("[dependencies]
 time = \"0.1.25\"
 ---
 fn main() {}
 "),
-    None);
+        None
+    );
 
-    assert_eq!(fem(
-"[dependencies]
+    assert_eq!(
+        fem("[dependencies]
 time = \"0.1.25\"
 
 fn main() {}
 "),
-    None);
+        None
+    );
 
     // Make sure we aren't just grabbing the *last* line.
-    assert_eq!(fem(
-"[dependencies]
+    assert_eq!(
+        fem("[dependencies]
 time = \"0.1.25\"
 
 fn main() {
     println!(\"Hi!\");
 }
 "),
-    None);
+        None
+    );
 
-    assert_eq!(fem(
-"// cargo-deps: time=\"0.1.25\"
+    assert_eq!(
+        fem("// cargo-deps: time=\"0.1.25\"
 fn main() {}
 "),
-    Some((
-DepList(" time=\"0.1.25\""),
-"// cargo-deps: time=\"0.1.25\"
+        Some((
+            DepList(" time=\"0.1.25\""),
+            "// cargo-deps: time=\"0.1.25\"
 fn main() {}
 "
-    )));
+        ))
+    );
 
-    assert_eq!(fem(
-"// cargo-deps: time=\"0.1.25\", libc=\"0.2.5\"
+    assert_eq!(
+        fem("// cargo-deps: time=\"0.1.25\", libc=\"0.2.5\"
 fn main() {}
 "),
-    Some((
-DepList(" time=\"0.1.25\", libc=\"0.2.5\""),
-"// cargo-deps: time=\"0.1.25\", libc=\"0.2.5\"
+        Some((
+            DepList(" time=\"0.1.25\", libc=\"0.2.5\""),
+            "// cargo-deps: time=\"0.1.25\", libc=\"0.2.5\"
 fn main() {}
 "
-    )));
+        ))
+    );
 
-    assert_eq!(fem(
-"
+    assert_eq!(
+        fem("
   // cargo-deps: time=\"0.1.25\"  \n\
 fn main() {}
 "),
-    Some((
-DepList(" time=\"0.1.25\"  "),
-"
+        Some((
+            DepList(" time=\"0.1.25\"  "),
+            "
   // cargo-deps: time=\"0.1.25\"  \n\
 fn main() {}
 "
-    )));
+        ))
+    );
 
-    assert_eq!(fem(
-"/* cargo-deps: time=\"0.1.25\" */
+    assert_eq!(
+        fem("/* cargo-deps: time=\"0.1.25\" */
 fn main() {}
 "),
-    None);
+        None
+    );
 
-    assert_eq!(fem(
-r#"//! [dependencies]
+    assert_eq!(
+        fem(r#"//! [dependencies]
 //! time = "0.1.25"
 fn main() {}
 "#),
-    None);
+        None
+    );
 
-    assert_eq!(fem(
-r#"//! ```Cargo
+    assert_eq!(
+        fem(r#"//! ```Cargo
 //! [dependencies]
 //! time = "0.1.25"
 //! ```
 fn main() {}
 "#),
-    Some((
-TomlOwned(r#"[dependencies]
+        Some((
+            TomlOwned(
+                r#"[dependencies]
 time = "0.1.25"
-"#.into()),
-r#"//! ```Cargo
+"#
+                .into()
+            ),
+            r#"//! ```Cargo
 //! [dependencies]
 //! time = "0.1.25"
 //! ```
 fn main() {}
 "#
-    )));
+        ))
+    );
 
-    assert_eq!(fem(
-r#"/*!
+    assert_eq!(
+        fem(r#"/*!
 [dependencies]
 time = "0.1.25"
 */
 fn main() {}
 "#),
-    None);
+        None
+    );
 
-    assert_eq!(fem(
-r#"/*!
+    assert_eq!(
+        fem(r#"/*!
 ```Cargo
 [dependencies]
 time = "0.1.25"
@@ -520,11 +553,14 @@ time = "0.1.25"
 */
 fn main() {}
 "#),
-    Some((
-TomlOwned(r#"[dependencies]
+        Some((
+            TomlOwned(
+                r#"[dependencies]
 time = "0.1.25"
-"#.into()),
-r#"/*!
+"#
+                .into()
+            ),
+            r#"/*!
 ```Cargo
 [dependencies]
 time = "0.1.25"
@@ -532,19 +568,21 @@ time = "0.1.25"
 */
 fn main() {}
 "#
-    )));
+        ))
+    );
 
-    assert_eq!(fem(
-r#"/*!
+    assert_eq!(
+        fem(r#"/*!
  * [dependencies]
  * time = "0.1.25"
  */
 fn main() {}
 "#),
-    None);
+        None
+    );
 
-    assert_eq!(fem(
-r#"/*!
+    assert_eq!(
+        fem(r#"/*!
  * ```Cargo
  * [dependencies]
  * time = "0.1.25"
@@ -552,11 +590,14 @@ r#"/*!
  */
 fn main() {}
 "#),
-    Some((
-TomlOwned(r#"[dependencies]
+        Some((
+            TomlOwned(
+                r#"[dependencies]
 time = "0.1.25"
-"#.into()),
-r#"/*!
+"#
+                .into()
+            ),
+            r#"/*!
  * ```Cargo
  * [dependencies]
  * time = "0.1.25"
@@ -564,20 +605,21 @@ r#"/*!
  */
 fn main() {}
 "#
-    )));
+        ))
+    );
 }
 
 /**
 Locates a "short comment manifest" in Rust source.
 */
-fn find_short_comment_manifest(s: &str) -> Option<(Manifest, &str)> {
+fn find_short_comment_manifest(s: &str) -> Option<(Manifest<'_>, &str)> {
     /*
     This is pretty simple: the only valid syntax for this is for the first, non-blank line to contain a single-line comment whose first token is `cargo-deps:`.  That's it.
     */
     let re = &*RE_SHORT_MANIFEST;
     if let Some(cap) = re.captures(s) {
         if let Some(m) = cap.get(1) {
-            return Some((Manifest::DepList(m.as_str()), &s[..]))
+            return Some((Manifest::DepList(m.as_str()), &s[..]));
         }
     }
     None
@@ -586,7 +628,7 @@ fn find_short_comment_manifest(s: &str) -> Option<(Manifest, &str)> {
 /**
 Locates a "code block manifest" in Rust source.
 */
-fn find_code_block_manifest(s: &str) -> Option<(Manifest, &str)> {
+fn find_code_block_manifest(s: &str) -> Option<(Manifest<'_>, &str)> {
     /*
     This has to happen in a few steps.
 
@@ -599,16 +641,16 @@ fn find_code_block_manifest(s: &str) -> Option<(Manifest, &str)> {
     let start = match RE_CRATE_COMMENT.captures(s) {
         Some(cap) => match cap.get(1) {
             Some(m) => m.start(),
-            None => return None
+            None => return None,
         },
-        None => return None
+        None => return None,
     };
 
     let comment = match extract_comment(&s[start..]) {
         Ok(s) => s,
         Err(err) => {
             error!("error slicing comment: {}", err);
-            return None
+            return None;
         }
     };
 
@@ -621,11 +663,10 @@ fn find_code_block_manifest(s: &str) -> Option<(Manifest, &str)> {
 Extracts the first `Cargo` fenced code block from a chunk of Markdown.
 */
 fn scrape_markdown_manifest(content: &str) -> Result<Option<String>> {
-    use self::hoedown::{Buffer, Markdown, Render};
+    use hoedown::{Buffer, Markdown, Render};
 
     // To match librustdoc/html/markdown.rs, HOEDOWN_EXTENSIONS.
-    let exts
-        = hoedown::NO_INTRA_EMPHASIS
+    let exts = hoedown::NO_INTRA_EMPHASIS
         | hoedown::TABLES
         | hoedown::FENCED_CODE
         | hoedown::AUTOLINK
@@ -640,9 +681,12 @@ fn scrape_markdown_manifest(content: &str) -> Result<Option<String>> {
     }
 
     impl Render for ManifestScraper {
-        fn code_block(&mut self, output: &mut Buffer, text: Option<&Buffer>, lang: Option<&Buffer>) {
-            use std::ascii::AsciiExt;
-
+        fn code_block(
+            &mut self,
+            output: &mut Buffer,
+            text: Option<&Buffer>,
+            lang: Option<&Buffer>,
+        ) {
             let lang = lang.map(|b| b.to_str().unwrap()).unwrap_or("");
 
             if !self.seen_manifest && lang.eq_ignore_ascii_case("cargo") {
@@ -656,29 +700,39 @@ fn scrape_markdown_manifest(content: &str) -> Result<Option<String>> {
         }
     }
 
-    let mut ms = ManifestScraper { seen_manifest: false };
+    let mut ms = ManifestScraper {
+        seen_manifest: false,
+    };
     let mani_buf = ms.render(&md);
 
-    if !ms.seen_manifest { return Ok(None) }
-    mani_buf.to_str().map(|s| Some(s.into()))
+    if !ms.seen_manifest {
+        return Ok(None);
+    }
+    mani_buf
+        .to_str()
+        .map(|s| Some(s.into()))
         .map_err(|_| "error decoding manifest as UTF-8".into())
 }
 
 #[test]
 fn test_scrape_markdown_manifest() {
     macro_rules! smm {
-        ($c:expr) => (scrape_markdown_manifest($c).map_err(|e| e.to_string()));
+        ($c:expr) => {
+            scrape_markdown_manifest($c).map_err(|e| e.to_string())
+        };
     }
 
-    assert_eq!(smm!(
-r#"There is no manifest in this comment.
+    assert_eq!(
+        smm!(
+            r#"There is no manifest in this comment.
 "#
         ),
-Ok(None)
+        Ok(None)
     );
 
-    assert_eq!(smm!(
-r#"There is no manifest in this comment.
+    assert_eq!(
+        smm!(
+            r#"There is no manifest in this comment.
 
 ```
 This is not a manifest.
@@ -691,23 +745,28 @@ println!("Nor is this.");
     Or this.
 "#
         ),
-Ok(None)
+        Ok(None)
     );
 
-    assert_eq!(smm!(
-r#"This is a manifest:
+    assert_eq!(
+        smm!(
+            r#"This is a manifest:
 
 ```cargo
 dependencies = { time = "*" }
 ```
 "#
         ),
-Ok(Some(r#"dependencies = { time = "*" }
-"#.into()))
+        Ok(Some(
+            r#"dependencies = { time = "*" }
+"#
+            .into()
+        ))
     );
 
-    assert_eq!(smm!(
-r#"This is *not* a manifest:
+    assert_eq!(
+        smm!(
+            r#"This is *not* a manifest:
 
 ```
 He's lying, I'm *totally* a manifest!
@@ -720,12 +779,16 @@ dependencies = { time = "*" }
 ```
 "#
         ),
-Ok(Some(r#"dependencies = { time = "*" }
-"#.into()))
+        Ok(Some(
+            r#"dependencies = { time = "*" }
+"#
+            .into()
+        ))
     );
 
-    assert_eq!(smm!(
-r#"This is a manifest:
+    assert_eq!(
+        smm!(
+            r#"This is a manifest:
 
 ```cargo
 dependencies = { time = "*" }
@@ -738,8 +801,11 @@ dependencies = { explode = true }
 ```
 "#
         ),
-Ok(Some(r#"dependencies = { time = "*" }
-"#.into()))
+        Ok(Some(
+            r#"dependencies = { time = "*" }
+"#
+            .into()
+        ))
     );
 }
 
@@ -751,7 +817,7 @@ fn extract_comment(s: &str) -> Result<String> {
 
     fn n_leading_spaces(s: &str, n: usize) -> Result<()> {
         if !s.chars().take(n).all(|c| c == ' ') {
-            return Err(format!("leading {:?} chars aren't all spaces: {:?}", n, s).into())
+            return Err(format!("leading {:?} chars aren't all spaces: {:?}", n, s).into());
         }
         Ok(())
     }
@@ -779,46 +845,45 @@ fn extract_comment(s: &str) -> Result<String> {
         let mut depth: u32 = 1;
 
         for line in s.lines() {
-            if depth == 0 { break }
+            if depth == 0 {
+                break;
+            }
 
             // Update nesting and look for end-of-comment.
             let mut end_of_comment = None;
 
-            for (end, marker) in {
-                nesting_re.find_iter(line)
-                    .map(|m| (m.start(), m.as_str()))
-            } {
+            for (end, marker) in { nesting_re.find_iter(line).map(|m| (m.start(), m.as_str())) } {
                 match (marker, depth) {
                     ("/*", _) => depth += 1,
                     ("*/", 1) => {
                         end_of_comment = Some(end);
                         depth = 0;
                         break;
-                    },
+                    }
                     ("*/", _) => depth -= 1,
-                    _ => panic!("got a comment marker other than /* or */")
+                    _ => panic!("got a comment marker other than /* or */"),
                 }
             }
 
             let line = end_of_comment.map(|end| &line[..end]).unwrap_or(line);
 
             // Detect and strip margin.
-            margin = margin
-                .or_else(|| margin_re.find(line)
-                    .and_then(|m| Some(m.as_str())));
+            margin = margin.or_else(|| margin_re.find(line).and_then(|m| Some(m.as_str())));
 
             let line = if let Some(margin) = margin {
-                let end = line.char_indices().take(margin.len())
-                    .map(|(i,c)| i + c.len_utf8()).last().unwrap_or(0);
+                let end = line
+                    .char_indices()
+                    .take(margin.len())
+                    .map(|(i, c)| i + c.len_utf8())
+                    .last()
+                    .unwrap_or(0);
                 &line[end..]
             } else {
                 line
             };
 
             // Detect and strip leading indentation.
-            leading_space = leading_space
-                .or_else(|| space_re.find(line)
-                    .map(|m| m.end()));
+            leading_space = leading_space.or_else(|| space_re.find(line).map(|m| m.end()));
 
             /*
             Make sure we have only leading spaces.
@@ -827,7 +892,7 @@ fn extract_comment(s: &str) -> Result<String> {
 
             Eurgh.
             */
-            try!(n_leading_spaces(line, leading_space.unwrap_or(0)));
+            n_leading_spaces(line, leading_space.unwrap_or(0))?;
 
             let strip_len = min(leading_space.unwrap_or(0), line.len());
             let line = &line[strip_len..];
@@ -854,14 +919,16 @@ fn extract_comment(s: &str) -> Result<String> {
             // Strip leading comment marker.
             let content = match comment_re.find(line) {
                 Some(m) => &line[m.end()..],
-                None => break
+                None => break,
             };
 
             // Detect and strip leading indentation.
-            leading_space = leading_space
-                .or_else(|| space_re.captures(content)
+            leading_space = leading_space.or_else(|| {
+                space_re
+                    .captures(content)
                     .and_then(|c| c.get(1))
-                    .map(|m| m.end()));
+                    .map(|m| m.end())
+            });
 
             /*
             Make sure we have only leading spaces.
@@ -870,7 +937,7 @@ fn extract_comment(s: &str) -> Result<String> {
 
             Eurgh.
             */
-            try!(n_leading_spaces(content, leading_space.unwrap_or(0)));
+            n_leading_spaces(content, leading_space.unwrap_or(0))?;
 
             let strip_len = min(leading_space.unwrap_or(0), content.len());
             let content = &content[strip_len..];
@@ -897,17 +964,15 @@ fn extract_comment(s: &str) -> Result<String> {
 #[test]
 fn test_extract_comment() {
     macro_rules! ec {
-        ($s:expr) => (extract_comment($s).map_err(|e| e.to_string()))
+        ($s:expr) => {
+            extract_comment($s).map_err(|e| e.to_string())
+        };
     }
 
-    assert_eq!(ec!(
-r#"fn main () {}"#
-        ),
-Err("no doc comment found".into())
-    );
+    assert_eq!(ec!(r#"fn main () {}"#), Err("no doc comment found".into()));
 
-    assert_eq!(ec!(
-r#"/*!
+    assert_eq!(
+        ec!(r#"/*!
 Here is a manifest:
 
 ```cargo
@@ -916,9 +981,8 @@ time = "*"
 ```
 */
 fn main() {}
-"#
-        ),
-Ok(r#"
+"#),
+        Ok(r#"
 Here is a manifest:
 
 ```cargo
@@ -926,11 +990,12 @@ Here is a manifest:
 time = "*"
 ```
 
-"#.into())
+"#
+        .into())
     );
 
-    assert_eq!(ec!(
-r#"/*!
+    assert_eq!(
+        ec!(r#"/*!
  * Here is a manifest:
  *
  * ```cargo
@@ -939,9 +1004,8 @@ r#"/*!
  * ```
  */
 fn main() {}
-"#
-        ),
-Ok(r#"
+"#),
+        Ok(r#"
 Here is a manifest:
 
 ```cargo
@@ -949,48 +1013,54 @@ Here is a manifest:
 time = "*"
 ```
 
-"#.into())
+"#
+        .into())
     );
 
-    assert_eq!(ec!(
-r#"//! Here is a manifest:
+    assert_eq!(
+        ec!(r#"//! Here is a manifest:
 //!
 //! ```cargo
 //! [dependencies]
 //! time = "*"
 //! ```
 fn main() {}
-"#
-        ),
-Ok(r#"Here is a manifest:
+"#),
+        Ok(r#"Here is a manifest:
 
 ```cargo
 [dependencies]
 time = "*"
 ```
-"#.into())
+"#
+        .into())
     );
 }
 
 /**
 Generates a default Cargo manifest for the given input.
 */
-fn default_manifest(input: &Input) -> Result<toml::Table> {
+fn default_manifest(input: &Input<'_>) -> Result<toml::value::Table> {
     let mani_str = {
         let pkg_name = input.package_name();
         let mut subs = HashMap::with_capacity(2);
         subs.insert(consts::MANI_NAME_SUB, &*pkg_name);
         subs.insert(consts::MANI_FILE_SUB, &input.safe_name()[..]);
-        try!(templates::expand(consts::DEFAULT_MANIFEST, &subs))
+        templates::expand(consts::DEFAULT_MANIFEST, &subs)?
     };
-    toml::Parser::new(&mani_str).parse()
-        .ok_or("could not parse default manifest, somehow".into())
+    toml::from_str(&mani_str).map_err(|e| {
+        MainError::Tag(
+            Blame::Internal,
+            "could not parse default manifest".into(),
+            Box::new(MainError::Other(Blame::Internal, Box::new(e))),
+        )
+    })
 }
 
 /**
 Generates a partial Cargo manifest containing the specified dependencies.
 */
-fn deps_manifest(deps: &[(String, String)]) -> Result<toml::Table> {
+fn deps_manifest(deps: &[(String, String)]) -> Result<toml::value::Table> {
     let mut mani_str = String::new();
     mani_str.push_str("[dependencies]\n");
 
@@ -999,15 +1069,23 @@ fn deps_manifest(deps: &[(String, String)]) -> Result<toml::Table> {
         mani_str.push_str("=");
 
         // We only want to quote the version if it *isn't* a table.
-        let quotes = match ver.starts_with("{") { true => "", false => "\"" };
+        let quotes = match ver.starts_with("{") {
+            true => "",
+            false => "\"",
+        };
         mani_str.push_str(quotes);
         mani_str.push_str(ver);
         mani_str.push_str(quotes);
         mani_str.push_str("\n");
     }
 
-    toml::Parser::new(&mani_str).parse()
-        .ok_or("could not parse dependency manifest".into())
+    toml::from_str(&mani_str).map_err(|e| {
+        MainError::Tag(
+            Blame::Human,
+            "could not parse dependency manifest".into(),
+            Box::new(MainError::Other(Blame::Internal, Box::new(e))),
+        )
+    })
 }
 
 /**
@@ -1015,38 +1093,43 @@ Given two Cargo manifests, merges the second *into* the first.
 
 Note that the "merge" in this case is relatively simple: only *top-level* tables are actually merged; everything else is just outright replaced.
 */
-fn merge_manifest(mut into_t: toml::Table, from_t: toml::Table) -> Result<toml::Table> {
+fn merge_manifest(
+    mut into_t: toml::value::Table,
+    from_t: toml::value::Table,
+) -> Result<toml::value::Table> {
     for (k, v) in from_t {
         match v {
             toml::Value::Table(from_t) => {
-                use std::collections::btree_map::Entry::*;
+                use toml::map::Entry::*;
 
                 // Merge.
                 match into_t.entry(k) {
                     Vacant(e) => {
                         e.insert(toml::Value::Table(from_t));
-                    },
+                    }
                     Occupied(e) => {
-                        let into_t = try!(as_table_mut(e.into_mut())
-                            .ok_or((Blame::Human, "cannot merge manifests: cannot merge \
-                                table and non-table values")));
+                        let into_t = as_table_mut(e.into_mut()).ok_or((
+                            Blame::Human,
+                            "cannot merge manifests: cannot merge \
+                             table and non-table values",
+                        ))?;
                         into_t.extend(from_t);
                     }
                 }
-            },
+            }
             v => {
                 // Just replace.
                 into_t.insert(k, v);
-            },
+            }
         }
     }
 
     return Ok(into_t);
 
-    fn as_table_mut(t: &mut toml::Value) -> Option<&mut toml::Table> {
+    fn as_table_mut(t: &mut toml::Value) -> Option<&mut toml::value::Table> {
         match *t {
             toml::Value::Table(ref mut t) => Some(t),
-            _ => None
+            _ => None,
         }
     }
 }
@@ -1054,7 +1137,7 @@ fn merge_manifest(mut into_t: toml::Table, from_t: toml::Table) -> Result<toml::
 /**
 Given a Cargo manifest, attempts to rewrite relative file paths to absolute ones, allowing the manifest to be relocated.
 */
-fn fix_manifest_paths(mani: toml::Table, base: &Path) -> Result<toml::Table> {
+fn fix_manifest_paths(mani: toml::value::Table, base: &Path) -> Result<toml::value::Table> {
     // Values that need to be rewritten:
     let paths: &[&[&str]] = &[
         &["build-dependencies", "*", "path"],
@@ -1067,21 +1150,21 @@ fn fix_manifest_paths(mani: toml::Table, base: &Path) -> Result<toml::Table> {
     let mut mani = toml::Value::Table(mani);
 
     for path in paths {
-        try!(iterate_toml_mut_path(&mut mani, path, &mut |v| {
+        iterate_toml_mut_path(&mut mani, path, &mut |v| {
             match *v {
                 toml::Value::String(ref mut s) => {
                     if Path::new(s).is_relative() {
                         let p = base.join(&*s);
                         match p.to_str() {
                             Some(p) => *s = p.into(),
-                            None => {},
+                            None => {}
                         }
                     }
-                },
+                }
                 _ => {}
             }
             Ok(())
-        }))
+        })?
     }
 
     match mani {
@@ -1094,7 +1177,9 @@ fn fix_manifest_paths(mani: toml::Table, base: &Path) -> Result<toml::Table> {
 Iterates over the specified TOML values via a path specification.
 */
 fn iterate_toml_mut_path<F>(base: &mut toml::Value, path: &[&str], on_each: &mut F) -> Result<()>
-where F: FnMut(&mut toml::Value) -> Result<()> {
+where
+    F: FnMut(&mut toml::Value) -> Result<()>,
+{
     if path.len() == 0 {
         return on_each(base);
     }
@@ -1106,22 +1191,20 @@ where F: FnMut(&mut toml::Value) -> Result<()> {
         match *base {
             toml::Value::Table(ref mut tab) => {
                 for (_, v) in tab {
-                    try!(iterate_toml_mut_path(v, tail, on_each));
+                    iterate_toml_mut_path(v, tail, on_each)?;
                 }
-            },
-            _ => {},
+            }
+            _ => {}
         }
     } else {
         match *base {
-            toml::Value::Table(ref mut tab) => {
-                match tab.get_mut(cur) {
-                    Some(v) => {
-                        try!(iterate_toml_mut_path(v, tail, on_each));
-                    },
-                    None => {},
+            toml::Value::Table(ref mut tab) => match tab.get_mut(cur) {
+                Some(v) => {
+                    iterate_toml_mut_path(v, tail, on_each)?;
                 }
+                None => {}
             },
-            _ => {},
+            _ => {}
         }
     }
 
diff --git a/src/platform.rs b/src/platform.rs
index f3f715aa..ef8797fb 100644
--- a/src/platform.rs
+++ b/src/platform.rs
@@ -12,9 +12,8 @@ This module is for platform-specific stuff.
 */
 
 pub use self::inner::{
-    current_time, file_last_modified, get_cache_dir, get_config_dir,
-    migrate_old_data, write_path, read_path,
-    force_cargo_color,
+    current_time, file_last_modified, force_cargo_color, get_cache_dir, get_config_dir,
+    migrate_old_data, read_path, write_path,
 };
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
@@ -31,12 +30,11 @@ impl MigrationKind {
 
 #[cfg(any(unix, windows))]
 mod inner_unix_or_windows {
-    extern crate time;
-
     /**
     Gets the current system time, in milliseconds since the UNIX epoch.
     */
     pub fn current_time() -> u64 {
+        use std::convert::TryInto;
         /*
         This is kinda dicey, since *ideally* both this function and `file_last_modified` would be using the same underlying APIs.  They are not, insofar as I know.
 
@@ -44,37 +42,32 @@ mod inner_unix_or_windows {
 
         That said, so long as everything is in the same units and uses the same epoch, it should be fine.
         */
-        let now_1970_utc = time::now_utc().to_timespec();
-        if now_1970_utc.sec < 0 || now_1970_utc.nsec < 0 {
-            // Fuck it.
-            return 0
-        }
-        let now_ms_1970_utc = (now_1970_utc.sec as u64 * 1000)
-            + (now_1970_utc.nsec as u64 / 1_000_000);
-        now_ms_1970_utc
+        (
+            time::OffsetDateTime::now() - time::OffsetDateTime::unix_epoch()
+        )
+        .whole_milliseconds()
+        .try_into()
+        .expect("expected timestamp within u64 millisecond range of Unix epoch")
     }
 }
 
 #[cfg(unix)]
 mod inner {
-    extern crate atty;
-
     pub use super::inner_unix_or_windows::current_time;
 
-    use std::path::{Path, PathBuf};
-    use std::{cmp, env, fs, io};
+    use crate::error::{Blame, MainError};
+    use super::MigrationKind;
+    use log::info;
     use std::os::unix::ffi::OsStrExt;
     use std::os::unix::fs::MetadataExt;
-    use error::{MainError, Blame};
-    use super::MigrationKind;
+    use std::path::{Path, PathBuf};
+    use std::{cmp, env, fs, io};
 
     /**
     Gets the last-modified time of a file, in milliseconds since the UNIX epoch.
     */
     pub fn file_last_modified(file: &fs::File) -> u64 {
-        let mtime_s_1970_utc = file.metadata()
-            .map(|md| md.mtime())
-            .unwrap_or(0);
+        let mtime_s_1970_utc = file.metadata().map(|md| md.mtime()).unwrap_or(0);
 
         let mtime_s_1970_utc = cmp::max(0, mtime_s_1970_utc);
         mtime_s_1970_utc as u64 * 1000
@@ -92,7 +85,8 @@ mod inner {
             let old_home = home.join(".cargo");
             if old_home.exists() {
                 // Keep using the old directory in preference to the new one, but only if it still contains `script-cache` and/or `binary-cache`.
-                if old_home.join("script-cache").exists() || old_home.join("binary-cache").exists() {
+                if old_home.join("script-cache").exists() || old_home.join("binary-cache").exists()
+                {
                     // Yup; use this one.
                     return Ok(old_home);
                 }
@@ -136,7 +130,10 @@ mod inner {
             let home = Path::new(&home);
             let old_base = home.join(".cargo");
             if old_base.exists() {
-                info!("<0.2.0 cache directory ({:?}) exists; attempting migration", old_base);
+                info!(
+                    "<0.2.0 cache directory ({:?}) exists; attempting migration",
+                    old_base
+                );
 
                 /*
                 Why both `info!` and `log`?  One for *before* we try (to help debug any issues) that only appears in the "real" log, and one for the user to let them know what we did/didn't do.
@@ -146,45 +143,63 @@ mod inner {
                 let new_script_cache = home.join("script-cache");
                 match (old_script_cache.exists(), new_script_cache.exists()) {
                     (true, true) => {
-                        info!("not migrating {:?}; already exists at new location", old_script_cache);
-                        log.push(format!("Did not move {:?}: new location {:?} already exists.", old_script_cache, new_script_cache));
-                    },
+                        info!(
+                            "not migrating {:?}; already exists at new location",
+                            old_script_cache
+                        );
+                        log.push(format!(
+                            "Did not move {:?}: new location {:?} already exists.",
+                            old_script_cache, new_script_cache
+                        ));
+                    }
                     (true, false) => {
                         info!("migrating {:?} -> {:?}", old_script_cache, new_script_cache);
                         if kind.for_real() {
-                            try!(fs::rename(&old_script_cache, &new_script_cache));
+                            fs::rename(&old_script_cache, &new_script_cache)?;
                         }
-                        log.push(format!("Moved {:?} to {:?}.", old_script_cache, new_script_cache));
-                    },
+                        log.push(format!(
+                            "Moved {:?} to {:?}.",
+                            old_script_cache, new_script_cache
+                        ));
+                    }
                     (false, _) => {
                         info!("not migrating {:?}; does not exist", old_script_cache);
-                    },
+                    }
                 }
 
                 let old_binary_cache = old_base.join("binary-cache");
                 let new_binary_cache = home.join("binary-cache");
                 match (old_binary_cache.exists(), new_binary_cache.exists()) {
                     (true, true) => {
-                        info!("not migrating {:?}; already exists at new location", old_binary_cache);
-                        log.push(format!("Did not move {:?}: new location {:?} already exists.", old_binary_cache, new_binary_cache));
-                    },
+                        info!(
+                            "not migrating {:?}; already exists at new location",
+                            old_binary_cache
+                        );
+                        log.push(format!(
+                            "Did not move {:?}: new location {:?} already exists.",
+                            old_binary_cache, new_binary_cache
+                        ));
+                    }
                     (true, false) => {
                         info!("migrating {:?} -> {:?}", old_binary_cache, new_binary_cache);
                         if kind.for_real() {
-                            try!(fs::rename(&old_binary_cache, &new_binary_cache));
+                            fs::rename(&old_binary_cache, &new_binary_cache)?;
                         }
-                        log.push(format!("Moved {:?} to {:?}.", old_script_cache, new_script_cache));
-                    },
+                        log.push(format!(
+                            "Moved {:?} to {:?}.",
+                            old_script_cache, new_script_cache
+                        ));
+                    }
                     (false, _) => {
                         info!("not migrating {:?}; does not exist", old_binary_cache);
-                    },
+                    }
                 }
 
                 // If `$CARGO_HOME/.cargo` is empty, remove it.
-                if try!(fs::read_dir(&old_base)).next().is_none() {
+                if fs::read_dir(&old_base)?.next().is_none() {
                     info!("{:?} is empty; removing", old_base);
                     if kind.for_real() {
-                        try!(fs::remove_dir(&old_base));
+                        fs::remove_dir(&old_base)?;
                     }
                     log.push(format!("Removed empty directory {:?}", old_base));
                 } else {
@@ -200,15 +215,19 @@ mod inner {
     }
 
     pub fn write_path<W>(w: &mut W, path: &Path) -> io::Result<()>
-    where W: io::Write {
+    where
+        W: io::Write,
+    {
         w.write_all(path.as_os_str().as_bytes())
     }
 
     pub fn read_path<R>(r: &mut R) -> io::Result<PathBuf>
-    where R: io::Read {
+    where
+        R: io::Read,
+    {
         use std::ffi::OsStr;
         let mut buf = vec![];
-        try!(r.read_to_end(&mut buf));
+        r.read_to_end(&mut buf)?;
         Ok(OsStr::from_bytes(&buf).into())
     }
 
@@ -226,66 +245,28 @@ mod inner {
 pub mod inner {
     #![allow(non_snake_case)]
 
-    extern crate ole32;
-    extern crate shell32;
-    extern crate winapi;
-
     pub use super::inner_unix_or_windows::current_time;
 
+    use super::MigrationKind;
+    use crate::error::MainError;
     use std::ffi::OsString;
     use std::fmt;
     use std::fs;
     use std::io;
-    use std::path::{Path, PathBuf};
     use std::mem;
     use std::os::windows::ffi::{OsStrExt, OsStringExt};
-    use error::MainError;
-    use super::MigrationKind;
-
-    #[cfg(old_rustc_windows_linking_behaviour)]
-    mod uuid {
-        // This *is* in `uuid-sys` ≤ 0.1.2, but it doesn't work in Rust < 1.15.
-        #[link(name="uuid")]
-        extern {
-            static FOLDERID_LocalAppData: super::winapi::KNOWNFOLDERID;
-            static FOLDERID_RoamingAppData: super::winapi::KNOWNFOLDERID;
-        }
-
-        pub unsafe fn local_app_data() -> &'static super::winapi::KNOWNFOLDERID {
-            &FOLDERID_LocalAppData
-        }
-
-        pub unsafe fn roaming_app_data() -> &'static super::winapi::KNOWNFOLDERID {
-            &FOLDERID_RoamingAppData
-        }
-    }
-
-    #[cfg(not(old_rustc_windows_linking_behaviour))]
-    mod uuid {
-        // WARNING: do not use with rustc < 1.15; it will cause linking errors.
-        extern crate uuid;
-
-        pub unsafe fn local_app_data() -> &'static super::winapi::KNOWNFOLDERID {
-            &uuid::FOLDERID_LocalAppData
-        }
-
-        pub unsafe fn roaming_app_data() -> &'static super::winapi::KNOWNFOLDERID {
-            &uuid::FOLDERID_RoamingAppData
-        }
-    }
+    use std::path::{Path, PathBuf};
 
     /**
     Gets the last-modified time of a file, in milliseconds since the UNIX epoch.
     */
     pub fn file_last_modified(file: &fs::File) -> u64 {
-        use ::std::os::windows::fs::MetadataExt;
+        use std::os::windows::fs::MetadataExt;
 
         const MS_BETWEEN_1601_1970: u64 = 11_644_473_600_000;
 
-        let mtime_100ns_1601_utc = file.metadata()
-            .map(|md| md.last_write_time())
-            .unwrap_or(0);
-        let mtime_ms_1601_utc = mtime_100ns_1601_utc / (1000*10);
+        let mtime_100ns_1601_utc = file.metadata().map(|md| md.last_write_time()).unwrap_or(0);
+        let mtime_ms_1601_utc = mtime_100ns_1601_utc / (1000 * 10);
 
         // This can obviously underflow... but since files created prior to 1970 are going to be *somewhat rare*, I'm just going to saturate to zero.
         let mtime_ms_1970_utc = mtime_ms_1601_utc.saturating_sub(MS_BETWEEN_1601_1970);
@@ -300,9 +281,9 @@ pub mod inner {
     On Windows, LocalAppData is where user- and machine- specific data should go, but it *might* be more appropriate to use whatever the official name for "Program Data" is, though.
     */
     pub fn get_cache_dir() -> Result<PathBuf, MainError> {
-        let rfid = unsafe { uuid::local_app_data() };
-        let dir = try!(SHGetKnownFolderPath(rfid, 0, ::std::ptr::null_mut())
-            .map_err(|e| e.to_string()));
+        let rfid = &winapi::um::knownfolders::FOLDERID_LocalAppData;
+        let dir =
+            SHGetKnownFolderPath(rfid, 0, ::std::ptr::null_mut()).map_err(|e| e.to_string())?;
         Ok(Path::new(&dir).to_path_buf().join("Cargo"))
     }
 
@@ -312,48 +293,52 @@ pub mod inner {
     This is *not* chosen to match the location where Cargo places its cache data, because Cargo is *wrong*.  This is at least *less wrong*.
     */
     pub fn get_config_dir() -> Result<PathBuf, MainError> {
-        let rfid = unsafe { uuid::roaming_app_data() };
-        let dir = try!(SHGetKnownFolderPath(rfid, 0, ::std::ptr::null_mut())
-            .map_err(|e| e.to_string()));
+        let rfid = &winapi::um::knownfolders::FOLDERID_RoamingAppData;
+        let dir =
+            SHGetKnownFolderPath(rfid, 0, ::std::ptr::null_mut()).map_err(|e| e.to_string())?;
         Ok(Path::new(&dir).to_path_buf().join("Cargo"))
     }
 
     type WinResult<T> = Result<T, WinError>;
 
-    struct WinError(winapi::HRESULT);
+    struct WinError(winapi::shared::winerror::HRESULT);
 
     impl fmt::Display for WinError {
-        fn fmt(&self, fmt: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
             write!(fmt, "HRESULT({})", self.0)
         }
     }
 
-    fn SHGetKnownFolderPath(rfid: &winapi::KNOWNFOLDERID, dwFlags: winapi::DWORD, hToken: winapi::HANDLE) -> WinResult<OsString> {
-        use self::winapi::PWSTR;
+    fn SHGetKnownFolderPath(
+        rfid: &winapi::um::shtypes::KNOWNFOLDERID,
+        dwFlags: winapi::shared::minwindef::DWORD,
+        hToken: winapi::shared::ntdef::HANDLE,
+    ) -> WinResult<OsString> {
+        use winapi::shared::ntdef::PWSTR;
         let mut psz_path: PWSTR = unsafe { mem::uninitialized() };
         let hresult = unsafe {
-            shell32::SHGetKnownFolderPath(
+            winapi::um::shlobj::SHGetKnownFolderPath(
                 rfid,
                 dwFlags,
                 hToken,
-                mem::transmute(&mut psz_path as &mut PWSTR as *mut PWSTR)
+                mem::transmute(&mut psz_path as &mut PWSTR as *mut PWSTR),
             )
         };
 
-        if hresult == winapi::S_OK {
+        if hresult == winapi::shared::winerror::S_OK {
             let r = unsafe { pwstr_to_os_string(psz_path) };
-            unsafe { ole32::CoTaskMemFree(psz_path as *mut _) };
+            unsafe { winapi::um::combaseapi::CoTaskMemFree(psz_path as *mut _) };
             Ok(r)
         } else {
             Err(WinError(hresult))
         }
     }
 
-    unsafe fn pwstr_to_os_string(ptr: winapi::PWSTR) -> OsString {
+    unsafe fn pwstr_to_os_string(ptr: winapi::shared::ntdef::PWSTR) -> OsString {
         OsStringExt::from_wide(::std::slice::from_raw_parts(ptr, pwstr_len(ptr)))
     }
 
-    unsafe fn pwstr_len(mut ptr: winapi::PWSTR) -> usize {
+    unsafe fn pwstr_len(mut ptr: winapi::shared::ntdef::PWSTR) -> usize {
         let mut len = 0;
         while *ptr != 0 {
             len += 1;
@@ -369,19 +354,23 @@ pub mod inner {
     }
 
     pub fn write_path<W>(w: &mut W, path: &Path) -> io::Result<()>
-    where W: io::Write {
+    where
+        W: io::Write,
+    {
         for word in path.as_os_str().encode_wide() {
             let lo = (word & 0xff) as u8;
             let hi = (word >> 8) as u8;
-            try!(w.write_all(&[lo, hi]));
+            w.write_all(&[lo, hi])?;
         }
         Ok(())
     }
 
     pub fn read_path<R>(r: &mut R) -> io::Result<PathBuf>
-    where R: io::Read {
+    where
+        R: io::Read,
+    {
         let mut buf = vec![];
-        try!(r.read_to_end(&mut buf));
+        r.read_to_end(&mut buf)?;
 
         let mut words = Vec::with_capacity(buf.len() / 2);
         let mut it = buf.iter().cloned();
@@ -390,7 +379,7 @@ pub mod inner {
             words.push(lo as u16 | ((hi as u16) << 8));
         }
 
-        return Ok(OsString::from_wide(&words).into())
+        return Ok(OsString::from_wide(&words).into());
     }
 
     /**
diff --git a/src/templates.rs b/src/templates.rs
index 80af4814..1467611e 100644
--- a/src/templates.rs
+++ b/src/templates.rs
@@ -10,16 +10,15 @@ or distributed except according to those terms.
 /*!
 This module contains code related to template support.
 */
+use crate::consts;
+use crate::error::{Blame, MainError, Result, ResultExt};
+use crate::platform;
+use lazy_static::lazy_static;
+use regex::Regex;
 use std::borrow::Cow;
 use std::collections::HashMap;
 use std::fs;
 use std::path::PathBuf;
-use clap;
-use open;
-use regex::Regex;
-use consts;
-use error::{Blame, MainError, Result, ResultExt};
-use platform;
 
 lazy_static! {
     static ref RE_SUB: Regex = Regex::new(r#"#\{([A-Za-z_][A-Za-z0-9_]*)}"#).unwrap();
@@ -64,29 +63,25 @@ impl Args {
             )
     }
 
-    pub fn parse(m: &clap::ArgMatches) -> Self {
+    pub fn parse(m: &clap::ArgMatches<'_>) -> Self {
         match m.subcommand() {
-            ("dump", Some(m)) => {
-                Args::Dump {
-                    name: m.value_of("template").unwrap().into(),
-                }
+            ("dump", Some(m)) => Args::Dump {
+                name: m.value_of("template").unwrap().into(),
             },
             ("list", _) => Args::List,
-            ("show", Some(m)) => {
-                Args::Show {
-                    path: m.is_present("show_path"),
-                }
+            ("show", Some(m)) => Args::Show {
+                path: m.is_present("show_path"),
             },
-            (name, _) => panic!("bad subcommand: {:?}", name)
+            (name, _) => panic!("bad subcommand: {:?}", name),
         }
     }
 }
 
 pub fn try_main(args: Args) -> Result<i32> {
     match args {
-        Args::Dump { name } => try!(dump(&name)),
-        Args::List => try!(list()),
-        Args::Show { path } => try!(show(path)),
+        Args::Dump { name } => dump(&name)?,
+        Args::List => list()?,
+        Args::Show { path } => show(path)?,
     }
 
     Ok(0)
@@ -94,10 +89,7 @@ pub fn try_main(args: Args) -> Result<i32> {
 
 pub fn expand(src: &str, subs: &HashMap<&str, &str>) -> Result<String> {
     // The estimate of final size is the sum of the size of all the input.
-    let sub_size = subs
-        .iter()
-        .map(|(_, v)| v.len())
-        .sum::<usize>();
+    let sub_size = subs.iter().map(|(_, v)| v.len()).sum::<usize>();
     let est_size = src.len() + sub_size;
 
     let mut anchor = 0;
@@ -117,7 +109,12 @@ pub fn expand(src: &str, subs: &HashMap<&str, &str>) -> Result<String> {
         let sub_name = m.get(1).unwrap().as_str();
         match subs.get(sub_name) {
             Some(s) => result.push_str(s),
-            None => return Err(MainError::OtherOwned(Blame::Human, format!("substitution `{}` in template is unknown", sub_name))),
+            None => {
+                return Err(MainError::OtherOwned(
+                    Blame::Human,
+                    format!("substitution `{}` in template is unknown", sub_name),
+                ));
+            }
         }
     }
     result.push_str(&src[anchor..]);
@@ -135,7 +132,7 @@ pub fn get_template_path() -> Result<PathBuf> {
         }
     }
 
-    let cache_path = try!(platform::get_config_dir());
+    let cache_path = platform::get_config_dir()?;
     Ok(cache_path.join("script-templates"))
 }
 
@@ -145,26 +142,28 @@ Attempts to locate and load the contents of the specified template.
 pub fn get_template(name: &str) -> Result<Cow<'static, str>> {
     use std::io::Read;
 
-    let base = try!(get_template_path());
+    let base = get_template_path()?;
 
     let file = fs::File::open(base.join(format!("{}.rs", name)))
         .map_err(MainError::from)
-        .err_tag(format!("template file `{}.rs` does not exist in {}",
+        .err_tag(format!(
+            "template file `{}.rs` does not exist in {}",
             name,
-            base.display()))
+            base.display()
+        ))
         .shift_blame(Blame::Human);
 
     // If the template is one of the built-in ones, do fallback if it wasn't found on disk.
     if file.is_err() {
         if let Some(text) = builtin_template(name) {
-            return Ok(text.into())
+            return Ok(text.into());
         }
     }
 
-    let mut file = try!(file);
+    let mut file = file?;
 
     let mut text = String::new();
-    try!(file.read_to_string(&mut text));
+    file.read_to_string(&mut text)?;
     Ok(text.into())
 }
 
@@ -179,7 +178,7 @@ fn builtin_template(name: &str) -> Option<&'static str> {
 }
 
 fn dump(name: &str) -> Result<()> {
-    let text = try!(get_template(name));
+    let text = get_template(name)?;
     print!("{}", text);
     Ok(())
 }
@@ -187,19 +186,27 @@ fn dump(name: &str) -> Result<()> {
 fn list() -> Result<()> {
     use std::ffi::OsStr;
 
-    let t_path = try!(get_template_path());
+    let t_path = get_template_path()?;
 
     if !t_path.exists() {
-        return Err(format!("cannot list template directory `{}`: it does not exist", t_path.display()).into());
+        return Err(format!(
+            "cannot list template directory `{}`: it does not exist",
+            t_path.display()
+        )
+        .into());
     }
 
     if !t_path.is_dir() {
-        return Err(format!("cannot list template directory `{}`: it is not a directory", t_path.display()).into());
+        return Err(format!(
+            "cannot list template directory `{}`: it is not a directory",
+            t_path.display()
+        )
+        .into());
     }
 
-    for entry in try!(fs::read_dir(&t_path)) {
-        let entry = try!(entry);
-        if !try!(entry.file_type()).is_file() {
+    for entry in fs::read_dir(&t_path)? {
+        let entry = entry?;
+        if !entry.file_type()?.is_file() {
             continue;
         }
         let f_path = entry.path();
@@ -214,19 +221,23 @@ fn list() -> Result<()> {
 }
 
 fn show(path: bool) -> Result<()> {
-    let t_path = try!(get_template_path());
+    let t_path = get_template_path()?;
 
     if path {
         println!("{}", t_path.display());
         Ok(())
     } else {
         if !t_path.exists() {
-            try!(fs::create_dir_all(&t_path));
+            fs::create_dir_all(&t_path)?;
         }
         if t_path.is_dir() {
-            try!(open::that(&t_path));
+            open::that(&t_path)?;
         } else {
-            return Err(format!("cannot open directory `{}`; it isn't a directory", t_path.display()).into());
+            return Err(format!(
+                "cannot open directory `{}`; it isn't a directory",
+                t_path.display()
+            )
+            .into());
         }
         Ok(())
     }
diff --git a/src/util.rs b/src/util.rs
index 0a68c2e6..7acea5ed 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -10,6 +10,7 @@ or distributed except according to those terms.
 /*!
 This module just contains other random implementation stuff.
 */
+use log::error;
 use std::error::Error;
 use std::marker::PhantomData;
 
@@ -18,7 +19,9 @@ A really, really hacky way of avoiding a variable binding.
 */
 pub trait ChainMap: Sized {
     fn chain_map<F>(self, f: F) -> Self
-    where F: FnOnce(Self) -> Self {
+    where
+        F: FnOnce(Self) -> Self,
+    {
         f(self)
     }
 }
@@ -34,12 +37,14 @@ A `Defer` can also be "disarmed", preventing the closure from running at all.
 */
 #[must_use]
 pub struct Defer<'a, F, E>(Option<F>, PhantomData<&'a F>)
-where F: 'a + FnOnce() -> Result<(), E>,
+where
+    F: FnOnce() -> Result<(), E>,
     E: Error;
 
 impl<'a, F, E> Defer<'a, F, E>
-where F: 'a + FnOnce() -> Result<(), E>,
-    E: Error
+where
+    F: 'a + FnOnce() -> Result<(), E>,
+    E: Error,
 {
     /**
     Create a new `Defer` with the given closure.
@@ -60,7 +65,7 @@ where F: 'a + FnOnce() -> Result<(), E>,
 impl<'a, F, E> ::std::ops::Drop for Defer<'a, F, E>
 where
     F: 'a + FnOnce() -> Result<(), E>,
-    E: Error
+    E: Error,
 {
     fn drop(&mut self) {
         if let Some(f) = self.0.take() {
@@ -71,17 +76,17 @@ where
     }
 }
 
-#[cfg(feature="suppress-cargo-output")]
-pub use self::suppress_child_output::{ChildToken, suppress_child_output};
+#[cfg(feature = "suppress-cargo-output")]
+pub use self::suppress_child_output::{suppress_child_output, ChildToken};
 
-#[cfg(feature="suppress-cargo-output")]
+#[cfg(feature = "suppress-cargo-output")]
 mod suppress_child_output {
+    use crate::error::Result;
+    use crossbeam_channel::select;
     use std::io;
     use std::process::{self, Command};
     use std::thread;
     use std::time::Duration;
-    use chan;
-    use error::Result;
 
     /**
     Suppresses the stderr output of a child process, unless:
@@ -96,31 +101,30 @@ mod suppress_child_output {
     pub fn suppress_child_output(cmd: &mut Command, timeout: Duration) -> Result<ChildToken> {
         cmd.stderr(process::Stdio::piped());
 
-        let mut child = try!(cmd.spawn());
+        let mut child = cmd.spawn()?;
         let stderr = child.stderr.take().expect("no stderr pipe found");
 
-        let timeout_chan = chan::after(timeout);
-        let (done_sig, done_gate) = chan::sync(0);
+        let timeout_chan = crossbeam_channel::after(timeout);
+        let (done_sig, done_gate) = crossbeam_channel::bounded(0);
 
         let _ = thread::spawn(move || {
             let show_stderr;
             let mut recv_done = false;
-            chan_select! {
-                timeout_chan.recv() => {
+            select! {
+                recv(timeout_chan) -> _ => {
                     show_stderr = true;
                 },
-                done_gate.recv() -> success => {
+                recv(done_gate) -> success => {
                     show_stderr = !success.unwrap_or(true);
                     recv_done = true;
                 },
             }
             if show_stderr {
                 let mut stderr = stderr;
-                io::copy(&mut stderr, &mut io::stderr())
-                    .expect("could not copy child stderr");
+                io::copy(&mut stderr, &mut io::stderr()).expect("could not copy child stderr");
             }
             if !recv_done {
-                done_gate.recv();
+                done_gate.recv().unwrap();
             }
         });
 
@@ -133,7 +137,7 @@ mod suppress_child_output {
 
     pub struct ChildToken {
         child: process::Child,
-        done_sig: Option<chan::Sender<bool>>,
+        done_sig: Option<crossbeam_channel::Sender<bool>>,
         // stderr_join: Option<thread::JoinHandle<()>>,
     }
 
@@ -143,13 +147,13 @@ mod suppress_child_output {
                 Ok(r) => r,
                 Err(e) => {
                     if let Some(done_sig) = self.done_sig.take() {
-                        done_sig.send(false);
+                        done_sig.send(false).unwrap();
                     }
                     return Err(e.into());
                 }
             };
             if let Some(done_sig) = self.done_sig.take() {
-                done_sig.send(st.success());
+                done_sig.send(st.success()).unwrap();
             }
             // if let Some(stderr_join) = self.stderr_join.take() {
             //     stderr_join.join()
diff --git a/tests/data/script-2018-edition.rs b/tests/data/script-2018-edition.rs
new file mode 100644
index 00000000..863789a9
--- /dev/null
+++ b/tests/data/script-2018-edition.rs
@@ -0,0 +1,14 @@
+//! ```cargo
+//! [package]
+//! edition = "2018"
+//!
+//! [dependencies]
+//! boolinator = "=0.1.0"
+//! ```
+
+use boolinator::Boolinator;
+
+fn main() {
+    println!("--output--");
+    println!("{:?}", true.as_some(1));
+}
diff --git a/tests/integration.rs b/tests/integration.rs
index 1fe53925..91de160b 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -5,9 +5,12 @@ Because *both* Cargo and Rust both know better than I do and won't let me tell t
 
 *All* integration tests have to be glommed into a single runner so that we can use locks to prevent Cargo from falling over and breaking both its legs as soon as a gentle breeze comes along.  I *would* do this "properly" using file locks, except that's apparently impossible in Rust without writing the whole stack yourself directly on native OS calls, and I just can't be arsed to go to *that* much effort just to get some bloody tests to work.
 */
-#[macro_use] extern crate lazy_static;
-#[macro_use] extern crate scan_rules;
-#[macro_use] mod util;
+#[macro_use]
+extern crate lazy_static;
+#[macro_use]
+extern crate scan_rules;
+#[macro_use]
+mod util;
 
 mod tests {
     mod expr;
diff --git a/tests/tests/expr.rs b/tests/tests/expr.rs
index c22cbc5a..4eac5206 100644
--- a/tests/tests/expr.rs
+++ b/tests/tests/expr.rs
@@ -3,7 +3,8 @@ fn test_expr_0() {
     let out = cargo_script!("-e", with_output_marker!("0")).unwrap();
     scan!(out.stdout_output();
         ("0") => ()
-    ).unwrap()
+    )
+    .unwrap()
 }
 
 #[test]
@@ -11,7 +12,8 @@ fn test_expr_comma() {
     let out = cargo_script!("-e", with_output_marker!("[1, 2, 3]")).unwrap();
     scan!(out.stdout_output();
         ("[1, 2, 3]") => ()
-    ).unwrap()
+    )
+    .unwrap()
 }
 
 #[test]
@@ -28,42 +30,64 @@ fn test_expr_temporary() {
 
 #[test]
 fn test_expr_dep() {
-    let out = cargo_script!("-D", "boolinator=0.1.0",
-        "-e", with_output_marker!(
+    let out = cargo_script!(
+        "-D",
+        "boolinator=0.1.0",
+        "-e",
+        with_output_marker!(
             prelude "use boolinator::Boolinator;";
             "true.as_some(1)"
-        )).unwrap();
+        )
+    )
+    .unwrap();
     scan!(out.stdout_output();
         ("Some(1)") => ()
-    ).unwrap()
+    )
+    .unwrap()
 }
 
 #[test]
 fn test_expr_dep_extern() {
-    let out = cargo_script!("-d", "boolinator=0.1.0", "-x", "boolinator",
-        "-e", with_output_marker!(
+    let out = cargo_script!(
+        "-d",
+        "boolinator=0.1.0",
+        "-x",
+        "boolinator",
+        "-e",
+        with_output_marker!(
             prelude "use boolinator::Boolinator;";
             "true.as_some(1)"
-        )).unwrap();
+        )
+    )
+    .unwrap();
     scan!(out.stdout_output();
         ("Some(1)") => ()
-    ).unwrap();
+    )
+    .unwrap();
 
-    let out = cargo_script!("-d", "boolinator=0.1.0",
-        "-e", with_output_marker!(
+    let out = cargo_script!(
+        "-d",
+        "boolinator=0.1.0",
+        "-e",
+        with_output_marker!(
             prelude "use boolinator::Boolinator;";
             "true.as_some(1)"
-        )).unwrap();
+        )
+    )
+    .unwrap();
     assert!(!out.success());
 
-    let out = cargo_script!("-x", "boolinator",
-        "-e", with_output_marker!("true")).unwrap();
+    let out = cargo_script!("-x", "boolinator", "-e", with_output_marker!("true")).unwrap();
     assert!(!out.success());
 
-    let out = cargo_script!("-e", with_output_marker!(
-        prelude "use boolinator::Boolinator;";
-        "true.as_some(1)"
-    )).unwrap();
+    let out = cargo_script!(
+        "-e",
+        with_output_marker!(
+            prelude "use boolinator::Boolinator;";
+            "true.as_some(1)"
+        )
+    )
+    .unwrap();
     assert!(!out.success());
 }
 
@@ -75,15 +99,12 @@ fn test_expr_panic() {
 
 #[test]
 fn test_expr_qmark() {
-    let code = if cfg!(has_qmark) {
-        with_output_marker!("\"42\".parse::<i32>()?.wrapping_add(1)")
-    } else {
-        with_output_marker!("try!(\"42\".parse::<i32>()).wrapping_add(1)")
-    };
+    let code = with_output_marker!("\"42\".parse::<i32>()?.wrapping_add(1)");
     let out = cargo_script!("-e", code).unwrap();
     scan!(out.stdout_output();
         ("43") => ()
-    ).unwrap();
+    )
+    .unwrap();
 }
 
 #[test]
@@ -91,11 +112,16 @@ fn test_expr_template() {
     let template_dir = "tests/data/templates";
     let out = cargo_script!(
         #[env(CARGO_SCRIPT_DEBUG_TEMPLATE_PATH=template_dir)]
-        "-t", "shout", "-e", with_output_marker!(r#""no way? no way!""#)
-    ).unwrap();
+        "-t",
+        "shout",
+        "-e",
+        with_output_marker!(r#""no way? no way!""#)
+    )
+    .unwrap();
     scan!(out.stdout_output();
         ("NO WAY? NO WAY!") => ()
-    ).unwrap();
+    )
+    .unwrap();
 }
 
 #[test]
@@ -103,11 +129,16 @@ fn test_expr_template_with_deps() {
     let template_dir = "tests/data/templates";
     let out = cargo_script!(
         #[env(CARGO_SCRIPT_DEBUG_TEMPLATE_PATH=template_dir)]
-        "-t", "boolinate", "-e", with_output_marker!(r#"true"#)
-    ).unwrap();
+        "-t",
+        "boolinate",
+        "-e",
+        with_output_marker!(r#"true"#)
+    )
+    .unwrap();
     scan!(out.stdout_output();
         ("Some(())") => ()
-    ).unwrap();
+    )
+    .unwrap();
 }
 
 #[test]
@@ -115,9 +146,12 @@ fn test_expr_template_override_expr() {
     let template_dir = "tests/data/templates/override";
     let out = cargo_script!(
         #[env(CARGO_SCRIPT_DEBUG_TEMPLATE_PATH=template_dir)]
-        "-e", with_output_marker!(r#"true"#)
-    ).unwrap();
+        "-e",
+        with_output_marker!(r#"true"#)
+    )
+    .unwrap();
     scan!(out.stdout_output();
         ("Some(())") => ()
-    ).unwrap();
+    )
+    .unwrap();
 }
diff --git a/tests/tests/script.rs b/tests/tests/script.rs
index 6f7f6bf8..d654e7cd 100644
--- a/tests/tests/script.rs
+++ b/tests/tests/script.rs
@@ -3,7 +3,8 @@ fn test_script_explicit() {
     let out = cargo_script!("-dboolinator", "tests/data/script-explicit.rs").unwrap();
     scan!(out.stdout_output();
         ("Some(1)") => ()
-    ).unwrap()
+    )
+    .unwrap()
 }
 
 #[test]
@@ -11,7 +12,8 @@ fn test_script_features() {
     let out = cargo_script!("--features", "dont-panic", "tests/data/script-features.rs").unwrap();
     scan!(out.stdout_output();
         ("Keep calm and borrow check.") => ()
-    ).unwrap();
+    )
+    .unwrap();
 
     let out = cargo_script!("tests/data/script-features.rs").unwrap();
     assert!(!out.success());
@@ -22,7 +24,8 @@ fn test_script_full_block() {
     let out = cargo_script!("tests/data/script-full-block.rs").unwrap();
     scan!(out.stdout_output();
         ("Some(1)") => ()
-    ).unwrap()
+    )
+    .unwrap()
 }
 
 #[test]
@@ -30,7 +33,8 @@ fn test_script_full_line() {
     let out = cargo_script!("tests/data/script-full-line.rs").unwrap();
     scan!(out.stdout_output();
         ("Some(1)") => ()
-    ).unwrap()
+    )
+    .unwrap()
 }
 
 #[test]
@@ -38,7 +42,8 @@ fn test_script_invalid_doc_comment() {
     let out = cargo_script!("tests/data/script-invalid-doc-comment.rs").unwrap();
     scan!(out.stdout_output();
         ("Hello, World!") => ()
-    ).unwrap()
+    )
+    .unwrap()
 }
 
 #[test]
@@ -46,7 +51,8 @@ fn test_script_no_deps() {
     let out = cargo_script!("tests/data/script-no-deps.rs").unwrap();
     scan!(out.stdout_output();
         ("Hello, World!") => ()
-    ).unwrap()
+    )
+    .unwrap()
 }
 
 #[test]
@@ -54,7 +60,8 @@ fn test_script_short() {
     let out = cargo_script!("tests/data/script-short.rs").unwrap();
     scan!(out.stdout_output();
         ("Some(1)") => ()
-    ).unwrap()
+    )
+    .unwrap()
 }
 
 #[test]
@@ -71,7 +78,8 @@ fn test_script_hyphens() {
         ("[0]:", let _: QuotedString, "[1]:", let arg: QuotedString) => {
             assert_eq!(arg, "-NotAnArg");
         }
-    ).unwrap()
+    )
+    .unwrap()
 }
 
 #[test]
@@ -85,20 +93,30 @@ fn test_script_slow_output() {
     let out = cargo_script!(
         "--use-shared-binary-cache=no",
         "tests/data/script-slow-output.rs"
-    ).unwrap();
+    )
+    .unwrap();
     assert!(out.stderr_raw().contains("Compiling slow-build"));
     assert!(out.stderr_raw().contains("Compiling script-slow-output"));
     scan!(out.stdout_output();
         ("Ok") => ()
-    ).unwrap()
+    )
+    .unwrap()
 }
 
 #[test]
 fn test_script_cs_env() {
-    let out = cargo_script!(
-        "tests/data/script-cs-env.rs"
-    ).unwrap();
+    let out = cargo_script!("tests/data/script-cs-env.rs").unwrap();
     scan!(out.stdout_output();
         ("Ok") => ()
+    )
+    .unwrap()
+}
+
+#[test]
+fn test_script_2018_edition() {
+    let out = cargo_script!("tests/data/script-2018-edition.rs").unwrap();
+    assert!(out.success());
+    scan!(out.stdout_output();
+        ("Some(1)") => ()
     ).unwrap()
 }
diff --git a/tests/tests/version.rs b/tests/tests/version.rs
index 68c4b6d5..7a72af16 100644
--- a/tests/tests/version.rs
+++ b/tests/tests/version.rs
@@ -4,5 +4,6 @@ fn test_version() {
     assert!(out.success());
     scan!(&out.stdout;
         ("cargo-script", &::std::env::var("CARGO_PKG_VERSION").unwrap(), .._) => ()
-    ).unwrap();
+    )
+    .unwrap();
 }
diff --git a/tests/util/mod.rs b/tests/util/mod.rs
index 26776412..c56e886b 100644
--- a/tests/util/mod.rs
+++ b/tests/util/mod.rs
@@ -6,10 +6,9 @@ macro_rules! cargo_script {
         $($args:expr),* $(,)*
     ) => {
         {
-            extern crate tempdir;
             use std::process::Command;
 
-            let cargo_lock = ::util::CARGO_MUTEX.lock().expect("could not acquire Cargo mutext");
+            let cargo_lock = crate::util::CARGO_MUTEX.lock().expect("could not acquire Cargo mutext");
 
             let temp_dir = tempdir::TempDir::new("cargo-script-test").unwrap();
             let cmd_str;
@@ -29,7 +28,7 @@ macro_rules! cargo_script {
                 cmd_str = format!("{:?}", cmd);
 
                 cmd.output()
-                    .map(::util::Output::from)
+                    .map(crate::util::Output::from)
             };
 
             if let Ok(out) = out.as_ref() {
@@ -58,11 +57,11 @@ macro_rules! cargo_script {
 
 macro_rules! with_output_marker {
     (prelude $p:expr; $e:expr) => {
-        format!(concat!($p, "{}", $e), ::util::OUTPUT_MARKER_CODE)
+        format!(concat!($p, "{}", $e), crate::util::OUTPUT_MARKER_CODE)
     };
 
     ($e:expr) => {
-        format!(concat!("{}", $e), ::util::OUTPUT_MARKER_CODE)
+        format!(concat!("{}", $e), crate::util::OUTPUT_MARKER_CODE)
     };
 }
 
@@ -84,15 +83,16 @@ impl Output {
     pub fn stdout_output(&self) -> &str {
         assert!(self.success());
         for marker in self.stdout.matches(OUTPUT_MARKER) {
-            let i = subslice_offset(&self.stdout, marker)
-                .expect("couldn't find marker in output");
-            let before_cp = self.stdout[..i].chars().rev().next()
-                .unwrap_or('\n');
-            if !(before_cp == '\r' || before_cp == '\n') { continue; }
-            let after = &self.stdout[i+OUTPUT_MARKER.len()..];
-            let after_cp = after.chars().next()
-                .expect("couldn't find cp after marker");
-            if !(after_cp == '\r' || after_cp == '\n') { continue; }
+            let i = subslice_offset(&self.stdout, marker).expect("couldn't find marker in output");
+            let before_cp = self.stdout[..i].chars().rev().next().unwrap_or('\n');
+            if !(before_cp == '\r' || before_cp == '\n') {
+                continue;
+            }
+            let after = &self.stdout[i + OUTPUT_MARKER.len()..];
+            let after_cp = after.chars().next().expect("couldn't find cp after marker");
+            if !(after_cp == '\r' || after_cp == '\n') {
+                continue;
+            }
             return after;
         }
         panic!("could not find `{}` in script output", OUTPUT_MARKER);