Update unstable-crate test

7 files changed, 1118 insertions, 537 deletions

diff --git a/src/Cargo.lock b/src/Cargo.lock
index e0e603e616f..1640ab10578 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -81,13 +81,18 @@ 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)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 =======
@@ -110,8 +115,23 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -125,15 +145,20 @@ dependencies = [
  "dbghelp-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)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
  "rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -142,8 +167,23 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
  "rustc-demangle 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -156,12 +196,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -170,8 +215,23 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
 ]
 
 [[package]]
@@ -206,6 +266,7 @@ dependencies = [
  "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -219,16 +280,11 @@ dependencies = [
  "toml 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
 <<<<<<< HEAD
- "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
- "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
- "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Update html-diff-rs dependency
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
@@ -262,22 +318,42 @@ dependencies = [
 
 [[package]]
 name = "cargo"
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
 version = "0.22.0"
 source = "git+https://github.com/rust-lang/cargo#bcf3997b1fa177afc5b6c632a6fbbf6cc75df427"
 replace = "cargo 0.22.0"
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> Update unstable-crate test
 version = "0.21.0"
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+<<<<<<< HEAD
+<<<<<<< HEAD
 source = "git+https://github.com/rust-lang/cargo#1566c92b5d28e435613918e59dc94755f99d73b1"
 replace = "cargo 0.21.0"
 =======
-version = "0.20.0"
 <<<<<<< HEAD
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 source = "git+https://github.com/rust-lang/cargo#ac04d2e0afa95cb749406f4934421342506da4f2"
 replace = "cargo 0.20.0"
 >>>>>>> Add warnings when rustdoc html rendering differs
 >>>>>>> Add warnings when rustdoc html rendering differs
+=======
+source = "git+https://github.com/rust-lang/cargo#eb6cf012a6cc23c9c89c4009564de9fccc38b9cb"
+>>>>>>> Update unstable-crate test
+=======
+source = "git+https://github.com/rust-lang/cargo#854bc167bbf74053f821f65cb86d506033f3d3a7"
+>>>>>>> Update unstable-crate test
+=======
+source = "git+https://github.com/rust-lang/cargo#cc8aa6f03274a91c3f3d86835ab36eb7de5099f0"
+>>>>>>> Update unstable check test
+=======
+source = "git+https://github.com/rust-lang/cargo#74e54214c9d13871934fde0ecb07250e523c4e92"
+>>>>>>> Update html-diff-rs dependency
+replace = "cargo 0.21.0"
+>>>>>>> Update unstable-crate test
 
 [[package]]
 name = "cargo"
@@ -285,9 +361,12 @@ name = "cargo"
 version = "0.22.0"
 =======
 version = "0.21.0"
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 =======
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+=======
+>>>>>>> Update unstable-crate test
 dependencies = [
  "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -296,17 +375,16 @@ dependencies = [
  "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "crates-io 0.11.0",
  "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "curl 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> Update unstable-crate test
  "curl 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
  "docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "docopt 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
  "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.11.0-rc.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -316,7 +394,6 @@ dependencies = [
  "git2-curl 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "hamcrest 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
  "hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "home 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ignore 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -334,6 +411,7 @@ dependencies = [
  "openssl 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
  "openssl 0.9.14 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 =======
  "jobserver 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -345,7 +423,12 @@ dependencies = [
  "openssl 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
  "psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -357,58 +440,9 @@ dependencies = [
  "shell-escape 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tar 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
  "termcolor 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "term 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "toml 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "cargo"
-version = "0.21.0"
-source = "git+https://github.com/rust-lang/cargo#d917378d335219be490aad3f22c196d99c638f28"
-dependencies = [
- "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crates-io 0.10.0 (git+https://github.com/rust-lang/cargo)",
- "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "docopt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "git2 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "git2-curl 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "jobserver 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
- "libgit2-sys 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "semver 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_ignored 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "shell-escape 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tar 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "termcolor 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "toml 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -430,8 +464,12 @@ dependencies = [
 =======
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
@@ -439,30 +477,35 @@ dependencies = [
  "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
- "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
- "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
  "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+ "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable check test
+>>>>>>> Update unstable check test
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
  "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tar 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "term 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 ]
@@ -524,18 +567,26 @@ dependencies = [
  "diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
  "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
+>>>>>>> Update unstable-crate test
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 =======
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -577,24 +628,7 @@ dependencies = [
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crates-io"
-version = "0.10.0"
-source = "git+https://github.com/rust-lang/cargo#d917378d335219be490aad3f22c196d99c638f28"
-dependencies = [
- "curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -604,13 +638,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "cssparser"
-version = "0.7.4"
+version = "0.13.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "procedural-masquerade 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cssparser-macros"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "procedural-masquerade 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -618,25 +665,40 @@ name = "curl"
 version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
-<<<<<<< HEAD
  "curl-sys 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 =======
 <<<<<<< HEAD
  "curl-sys 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
+=======
+ "curl-sys 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+=======
+>>>>>>> Update unstable check test
  "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
  "openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
  "openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -644,6 +706,7 @@ dependencies = [
 =======
  "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "socket2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< HEAD
 =======
  "curl-sys 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -651,17 +714,14 @@ dependencies = [
  "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+=======
+>>>>>>> Update unstable-crate test
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "curl-sys"
-<<<<<<< HEAD
 version = "0.3.14"
-=======
-<<<<<<< HEAD
-version = "0.3.13"
->>>>>>> Make html_diff compiles only after stage0
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -670,17 +730,6 @@ dependencies = [
  "openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-version = "0.3.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
- "libz-sys 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "vcpkg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -723,14 +772,20 @@ dependencies = [
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
  "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
@@ -753,8 +808,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+>>>>>>> Update unstable-crate test
  "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+ "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable check test
+=======
+ "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
  "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -764,63 +829,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "encoding"
-version = "0.2.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "encoding-index-japanese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "encoding-index-korean"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "encoding-index-simpchinese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "encoding-index-singlebyte"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "encoding-index-tradchinese"
-version = "1.20141219.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "encoding_index_tests"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
 name = "enum_primitive"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -875,12 +883,17 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -897,8 +910,23 @@ dependencies = [
  "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
 ]
 
 [[package]]
@@ -919,12 +947,17 @@ version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -933,8 +966,23 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
  "miniz-sys 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -959,12 +1007,17 @@ 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)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -973,8 +1026,23 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1010,30 +1078,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> Update unstable-crate test
  "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
  "libgit2-sys 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
- "libgit2-sys 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -1044,11 +1118,7 @@ dependencies = [
  "curl 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "git2 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -1100,54 +1170,31 @@ dependencies = [
 ]
 
 [[package]]
-<<<<<<< HEAD
-<<<<<<< HEAD
-name = "hex"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-=======
-=======
 name = "hex"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
->>>>>>> Make html_diff compiles only after stage0
 name = "html-diff"
-version = "0.0.2"
+version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "html5ever-atoms 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "kuchiki 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kuchiki 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "html5ever"
-version = "0.13.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "html5ever-atoms 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "markup5ever 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tendril 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "html5ever-atoms"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "string_cache 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_codegen 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
->>>>>>> Add warnings when rustdoc html rendering differs
-
-[[package]]
 name = "highlight"
 version = "0.1.0"
 
@@ -1172,20 +1219,9 @@ name = "idna"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
-<<<<<<< HEAD
-<<<<<<< HEAD
  "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-bidi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
- "unicode-normalization 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Add warnings when rustdoc html rendering differs
 ]
 
 [[package]]
@@ -1241,12 +1277,17 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -1255,8 +1296,23 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
  "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1283,15 +1339,13 @@ dependencies = [
 
 [[package]]
 name = "kuchiki"
-version = "0.4.3"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cssparser 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "html5ever 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "html5ever-atoms 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "html5ever 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "ref_slice 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "selectors 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "selectors 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1303,11 +1357,7 @@ dependencies = [
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
  "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1326,12 +1376,17 @@ dependencies = [
 [[package]]
 name = "libc"
 <<<<<<< HEAD
+<<<<<<< HEAD
 version = "0.2.29"
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
 version = "0.2.27"
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 version = "0.2.26"
 =======
 <<<<<<< HEAD
@@ -1340,8 +1395,23 @@ version = "0.2.24"
 version = "0.2.23"
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+version = "0.2.24"
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+version = "0.2.26"
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1350,12 +1420,7 @@ version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cmake 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
  "curl-sys 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-<<<<<<< HEAD
- "curl-sys 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
  "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "libssh2-sys 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1367,6 +1432,7 @@ dependencies = [
  "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
  "openssl-sys 0.9.14 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 =======
  "curl-sys 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1376,7 +1442,12 @@ dependencies = [
  "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1387,8 +1458,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cmake 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
@@ -1399,26 +1474,30 @@ dependencies = [
  "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
 <<<<<<< HEAD
- "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
+=======
+>>>>>>> Update html-diff-rs dependency
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl-sys 0.9.14 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 =======
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
  "libz-sys 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "libz-sys"
-<<<<<<< HEAD
 version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
@@ -1426,15 +1505,6 @@ dependencies = [
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "vcpkg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -1454,12 +1524,17 @@ dependencies = [
  "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -1468,8 +1543,23 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
 ]
 
 [[package]]
@@ -1478,6 +1568,19 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
+name = "markup5ever"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tendril 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
 name = "matches"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1488,30 +1591,23 @@ version = "0.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 <<<<<<< HEAD
+<<<<<<< HEAD
  "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
  "clap 2.25.1 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> Update html-diff-rs dependency
  "clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Add warnings when rustdoc html rendering differs
 >>>>>>> Add warnings when rustdoc html rendering differs
  "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "handlebars 0.26.2 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "clap 2.24.2 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
-<<<<<<< HEAD
- "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Add warnings when rustdoc html rendering differs
-=======
- "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
- "handlebars 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Add warnings when rustdoc html rendering differs
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "pulldown-cmark 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1527,12 +1623,17 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -1541,8 +1642,23 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
 ]
 
 [[package]]
@@ -1551,12 +1667,17 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -1565,8 +1686,23 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
 ]
 
 [[package]]
@@ -1576,12 +1712,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -1590,8 +1731,23 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
 ]
 
 [[package]]
@@ -1617,12 +1773,17 @@ dependencies = [
  "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -1631,8 +1792,23 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1705,13 +1881,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "num_cpus"
-<<<<<<< HEAD
 version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
@@ -1719,6 +1898,7 @@ dependencies = [
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
  "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< HEAD
 =======
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1726,8 +1906,22 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
 ]
 
 [[package]]
@@ -1742,8 +1936,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "openssl"
 <<<<<<< HEAD
+<<<<<<< HEAD
 version = "0.9.17"
 =======
+=======
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
+>>>>>>> Update unstable-crate test
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
 version = "0.9.15"
 =======
@@ -1753,36 +1951,62 @@ version = "0.9.14"
 version = "0.9.13"
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+version = "0.9.14"
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
  "openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
  "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> Update unstable-crate test
  "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
  "openssl-sys 0.9.14 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 =======
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.9.14 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
 ]
 
 [[package]]
@@ -1793,8 +2017,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "openssl-sys"
 <<<<<<< HEAD
+<<<<<<< HEAD
 version = "0.9.17"
 =======
+=======
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
+>>>>>>> Update unstable-crate test
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
 version = "0.9.15"
 >>>>>>> Make html_diff compiles only after stage0
@@ -1807,14 +2035,17 @@ dependencies = [
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> Update unstable-crate test
 version = "0.9.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
 =======
  "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< HEAD
 =======
 version = "0.9.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1824,8 +2055,18 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+=======
+>>>>>>> Update html-diff-rs dependency
  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1906,6 +2147,11 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
+name = "precomputed-hash"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
 name = "proc_macro"
 version = "0.0.0"
 dependencies = [
@@ -1914,6 +2160,11 @@ dependencies = [
 ]
 
 [[package]]
+name = "procedural-masquerade"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
 name = "profiler_builtins"
 version = "0.0.0"
 dependencies = [
@@ -1958,6 +2209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "racer"
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 version = "2.0.10"
 =======
 =======
@@ -1974,17 +2226,24 @@ version = "2.0.7"
 version = "2.0.8"
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+=======
+version = "2.0.9"
+>>>>>>> Update unstable-crate test
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+=======
+ "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex_errors 0.52.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex_syntax 0.52.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2005,8 +2264,12 @@ version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
@@ -2025,18 +2288,21 @@ version = "0.1.0"
 =======
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Update html-diff-rs dependency
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
 =======
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
 <<<<<<< HEAD
- "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
- "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Update unstable-crate test
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2050,6 +2316,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 >>>>>>> Add warnings when rustdoc html rendering differs
 =======
 >>>>>>> Make html_diff compiles only after stage0
+=======
+>>>>>>> Update html-diff-rs dependency
 name = "regex"
 version = "0.1.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2102,12 +2370,16 @@ dependencies = [
  "cargo 0.22.0 (git+https://github.com/rust-lang/cargo)",
  "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "jsonrpc-core 7.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "languageserver-types 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "racer 2.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
  "jsonrpc-core 7.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "languageserver-types 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2123,30 +2395,19 @@ dependencies = [
  "rls-data 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
- "languageserver-types 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
 <<<<<<< HEAD
- "languageserver-types 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Add warnings when rustdoc html rendering differs
+=======
+>>>>>>> Update html-diff-rs dependency
+ "languageserver-types 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "racer 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "rls-analysis 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rls-data 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2
 =======
  "languageserver-types 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
-<<<<<<< HEAD
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "racer 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
- "racer 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Add warnings when rustdoc html rendering differs
-=======
- "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "racer 2.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
  "rls-analysis 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rls-data 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
@@ -2166,8 +2427,9 @@ dependencies = [
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+=======
+>>>>>>> Update unstable check test
  "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
  "rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
  "rustfmt-nightly 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2180,29 +2442,42 @@ dependencies = [
  "serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
  "rustfmt-nightly 0.1.8 (git+https://github.com/rust-lang-nursery/rustfmt?branch=rustfmt-42492)",
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
  "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> Update unstable-crate test
  "rls-vfs 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< HEAD
  "rustfmt-nightly 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "rustfmt-nightly 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable check test
+>>>>>>> Update unstable check test
+<<<<<<< HEAD
+>>>>>>> Update unstable check test
+=======
+=======
+ "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
  "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "rls-vfs 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustfmt 0.9.0 (git+https://github.com/rust-lang-nursery/rustfmt?branch=libsyntax)",
- "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "toml 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
  "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2246,6 +2521,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
  "racer 2.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 =======
@@ -2262,6 +2538,9 @@ dependencies = [
  "racer 2.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+=======
+ "racer 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
  "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2281,6 +2560,7 @@ dependencies = [
  "flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "fmt_macros 0.0.0",
  "graphviz 0.0.0",
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "jobserver 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
@@ -2289,6 +2569,9 @@ dependencies = [
 =======
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+=======
+ "jobserver 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_back 0.0.0",
@@ -2498,11 +2781,7 @@ dependencies = [
 name = "rustc_metadata"
 version = "0.0.0"
 dependencies = [
-<<<<<<< HEAD
  "flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "flate 0.0.0",
->>>>>>> Make html_diff compiles only after stage0
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc_macro 0.0.0",
@@ -2600,8 +2879,12 @@ version = "0.0.0"
 dependencies = [
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "rls-data 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
+>>>>>>> Update unstable-crate test
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "rls-data 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
@@ -2611,7 +2894,13 @@ dependencies = [
  "rls-data 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+ "rls-data 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
  "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc 0.0.0",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2626,8 +2915,11 @@ name = "rustc_trans"
 version = "0.0.0"
 dependencies = [
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> Update unstable-crate test
  "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
  "flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2636,11 +2928,14 @@ dependencies = [
  "jobserver 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
  "jobserver 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 =======
  "flate 0.0.0",
  "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+=======
+>>>>>>> Update unstable-crate test
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2702,27 +2997,10 @@ name = "rustdoc"
 version = "0.0.0"
 dependencies = [
  "build_helper 0.1.0",
-<<<<<<< HEAD
-<<<<<<< HEAD
- "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
- "gcc 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "gcc 0.3.46 (registry+https://github.com/rust-lang/crates.io-index)",
- "html-diff 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Add warnings when rustdoc html rendering differs
- "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Add warnings when rustdoc html rendering differs
-=======
  "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "html-diff 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "html-diff 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
  "pulldown-cmark 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2734,22 +3012,30 @@ dependencies = [
 ]
 
 [[package]]
-<<<<<<< HEAD
 name = "rustfmt-nightly"
 <<<<<<< HEAD
+<<<<<<< HEAD
 version = "0.2.2"
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
 version = "0.2.1"
 >>>>>>> Add warnings when rustdoc html rendering differs
 source = "registry+https://github.com/rust-lang/crates.io-index"
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 version = "0.1.8"
 source = "git+https://github.com/rust-lang-nursery/rustfmt?branch=rustfmt-42492#7333dfc95b4af5c7283ba03f33c50f108d2be3f5"
 =======
 version = "0.1.7"
+=======
+version = "0.1.8"
+>>>>>>> Update unstable check test
 source = "registry+https://github.com/rust-lang/crates.io-index"
+<<<<<<< HEAD
 =======
 name = "rustfmt"
 version = "0.9.0"
@@ -2769,19 +3055,33 @@ source = "git+https://github.com/rust-lang-nursery/rustfmt#c0fae6a82a4cea3320f6e
 =======
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+=======
+version = "0.1.8"
+source = "git+https://github.com/rust-lang-nursery/rustfmt?branch=rustfmt-42492#7333dfc95b4af5c7283ba03f33c50f108d2be3f5"
+>>>>>>> Update html-diff-rs dependency
 dependencies = [
  "diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -2790,24 +3090,37 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "strings 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
-<<<<<<< HEAD
  "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
  "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
  "toml 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
  "unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< HEAD
 =======
 =======
 <<<<<<< HEAD
@@ -2820,9 +3133,13 @@ dependencies = [
  "term 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Add warnings when rustdoc html rendering differs
+=======
+>>>>>>> Update unstable-crate test
  "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Add warnings when rustdoc html rendering differs
 >>>>>>> Add warnings when rustdoc html rendering differs
+=======
+>>>>>>> Update html-diff-rs dependency
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2842,13 +3159,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "selectors"
-version = "0.15.2"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cssparser 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cssparser 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2872,7 +3193,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
+<<<<<<< HEAD
+<<<<<<< HEAD
 version = "1.0.11"
+=======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
+<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2
+version = "1.0.10"
+=======
+<<<<<<< HEAD
+=======
+version = "0.9.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "serde"
+>>>>>>> Update unstable check test
+version = "1.0.9"
+>>>>>>> Update unstable check test
+<<<<<<< HEAD
+>>>>>>> Update unstable check test
+=======
+=======
+version = "1.0.10"
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -2899,7 +3246,39 @@ name = "serde_ignored"
 version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+<<<<<<< HEAD
+<<<<<<< HEAD
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
+<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2
+ "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+ "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< HEAD
+=======
+]
+
+[[package]]
+name = "serde_json"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable check test
+>>>>>>> Update unstable check test
+<<<<<<< HEAD
+>>>>>>> Update unstable check test
+=======
+=======
+ "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
 ]
 
 [[package]]
@@ -2909,8 +3288,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
  "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< HEAD
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+=======
+ "num-traits 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+ "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
 ]
 
 [[package]]
@@ -2923,7 +3310,16 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-<<<<<<< HEAD
+name = "siphasher"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "smallvec"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
 name = "socket2"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2934,11 +3330,6 @@ dependencies = [
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
-=======
-name = "siphasher"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
->>>>>>> Add warnings when rustdoc html rendering differs
 
 [[package]]
 name = "stable_deref_trait"
@@ -2979,29 +3370,26 @@ dependencies = [
 
 [[package]]
 name = "string_cache"
-version = "0.4.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
-<<<<<<< HEAD
- "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-=======
  "debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache_codegen 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "string_cache_codegen"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -3019,7 +3407,6 @@ dependencies = [
 ]
 
 [[package]]
->>>>>>> Add warnings when rustdoc html rendering differs
 name = "strsim"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3035,15 +3422,6 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "syn"
 version = "0.11.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
@@ -3098,12 +3476,17 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -3112,8 +3495,23 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex_pos 0.52.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3136,12 +3534,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -3150,8 +3553,23 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex_errors 0.52.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3167,12 +3585,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -3181,8 +3604,23 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
  "xattr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -3196,13 +3634,12 @@ dependencies = [
 
 [[package]]
 name = "tendril"
-version = "0.2.4"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "futf 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "utf-8 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf-8 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3225,12 +3662,17 @@ 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)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -3239,8 +3681,23 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -3249,11 +3706,7 @@ name = "termcolor"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
-<<<<<<< HEAD
  "wincolor 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "wincolor 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -3280,14 +3733,22 @@ 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)",
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+>>>>>>> Update unstable-crate test
 <<<<<<< HEAD
  "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
@@ -3305,16 +3766,30 @@ 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)",
 <<<<<<< HEAD
- "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+<<<<<<< HEAD
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+>>>>>>> Update unstable-crate test
+=======
+>>>>>>> Update unstable check test
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
 ]
 
 [[package]]
->>>>>>> Make html_diff compiles only after stage0
 name = "thread_local"
 version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3358,24 +3833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "unicode-bidi"
-<<<<<<< HEAD
-<<<<<<< HEAD
 version = "0.3.4"
-=======
-=======
->>>>>>> Make html_diff compiles only after stage0
-<<<<<<< HEAD
-version = "0.3.3"
-=======
-version = "0.2.6"
->>>>>>> Add warnings when rustdoc html rendering differs
-<<<<<<< HEAD
->>>>>>> Add warnings when rustdoc html rendering differs
-=======
-=======
-version = "0.3.3"
->>>>>>> Make html_diff compiles only after stage0
->>>>>>> Make html_diff compiles only after stage0
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3383,11 +3841,7 @@ dependencies = [
 
 [[package]]
 name = "unicode-normalization"
-<<<<<<< HEAD
 version = "0.1.5"
-=======
-version = "0.1.4"
->>>>>>> Add warnings when rustdoc html rendering differs
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -3412,6 +3866,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "unreachable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unreachable"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
@@ -3419,20 +3881,10 @@ dependencies = [
 ]
 
 [[package]]
-<<<<<<< HEAD
 name = "unstable-book-gen"
 version = "0.1.0"
 dependencies = [
  "tidy 0.1.0",
-=======
-name = "url"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "idna 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -3440,18 +3892,17 @@ name = "url"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> Update unstable-crate test
  "idna 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
  "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -3473,7 +3924,7 @@ dependencies = [
  "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 name = "utf-8"
-version = "0.6.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
@@ -3496,11 +3947,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "vcpkg"
-<<<<<<< HEAD
 version = "0.2.2"
-=======
-version = "0.2.0"
->>>>>>> Make html_diff compiles only after stage0
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -3535,11 +3982,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "wincolor"
-<<<<<<< HEAD
 version = "0.1.4"
-=======
-version = "0.1.3"
->>>>>>> Make html_diff compiles only after stage0
 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)",
@@ -3561,12 +4004,17 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
  "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
 =======
 <<<<<<< HEAD
@@ -3575,8 +4023,23 @@ dependencies = [
  "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
+=======
+=======
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
 ]
 
 [[package]]
@@ -3599,6 +4062,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
 "checksum ar 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b24e4eef8e3fa7e2ca75b157e6039cdf8d9d3a68213ddc19d0fd9d576b9717c9"
 "checksum atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159"
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 "checksum backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "72f9b4182546f4b04ebc4ab7f84948953a118bd6021a1b6a6c909e3e94f6be76"
@@ -3613,32 +4078,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum backtrace-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d192fd129132fbc97497c1f2ec2c2c5174e376b95f535199ef4fe0a293d33842"
 >>>>>>> Add warnings when rustdoc html rendering differs
 =======
+=======
+>>>>>>> Update unstable-crate test
 "checksum backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "72f9b4182546f4b04ebc4ab7f84948953a118bd6021a1b6a6c909e3e94f6be76"
 "checksum backtrace-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3a0d842ea781ce92be2bf78a9b38883948542749640b8378b3b2f03d1fd9f1ff"
->>>>>>> Make html_diff compiles only after stage0
 "checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23"
 >>>>>>> Add warnings when rustdoc html rendering differs
 >>>>>>> Add warnings when rustdoc html rendering differs
+=======
+"checksum backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "72f9b4182546f4b04ebc4ab7f84948953a118bd6021a1b6a6c909e3e94f6be76"
+"checksum backtrace-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3a0d842ea781ce92be2bf78a9b38883948542749640b8378b3b2f03d1fd9f1ff"
+>>>>>>> Update html-diff-rs dependency
 "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
 "checksum bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4"
 "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
 "checksum bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f382711e76b9de6c744cc00d0497baba02fb00a787f088c879f01d09468e32"
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
 "checksum cargo 0.22.0 (git+https://github.com/rust-lang/cargo)" = "<none>"
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
+=======
+>>>>>>> Update unstable-crate test
 "checksum cargo 0.21.0 (git+https://github.com/rust-lang/cargo)" = "<none>"
 >>>>>>> Add warnings when rustdoc html rendering differs
 "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
+<<<<<<< HEAD
+<<<<<<< HEAD
 "checksum clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2267a8fdd4dce6956ba6649e130f62fb279026e5e84b92aa939ac8f85ce3f9f0"
+=======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
+<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2
+"checksum clap 2.25.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7f1aabf260a8f3fefa8871f16b531038c98dd9eab1cfa2c575e78c459abfa3a0"
+>>>>>>> Update unstable check test
 "checksum cmake 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ebbb35d3dc9cd09497168f33de1acb79b265d350ab0ac34133b98f8509af1f"
 "checksum core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5909502e547762013619f4c4e01cc7393c20fe2d52d7fa471c1210adb2320dc7"
 "checksum core-foundation-sys 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bc9fb3d6cb663e6fd7cf1c63f9b144ee2b1e4a78595a0451dd34bff85b9a3387"
 "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
 "checksum curl 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7034c534a1d7d22f7971d6088aa9d281d219ef724026c3428092500f41ae9c2c"
 =======
+=======
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
 "checksum curl 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6689276ab61f97c660669a5ecc117c36875dfc1ba301c986b16c653415bdf9d7"
 <<<<<<< HEAD
 >>>>>>> Add warnings when rustdoc html rendering differs
@@ -3648,48 +4134,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 =======
 "checksum cargo 0.20.0 (git+https://github.com/rust-lang/cargo)" = "<none>"
 "checksum cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c"
-<<<<<<< HEAD
-"checksum clap 2.19.3 (registry+https://github.com/rust-lang/crates.io-index)" = "95b78f3fe0fc94c13c731714363260e04b557a637166f33a4570d3189d642374"
 =======
-"checksum chrono 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d9123be86fd2a8f627836c235ecdf331fdd067ecf7ac05aa1a68fbcf2429f056"
+>>>>>>> Update unstable check test
+<<<<<<< HEAD
 =======
-"checksum cargo 0.21.0 (git+https://github.com/rust-lang/cargo)" = "<none>"
-"checksum cfg-if 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c47d456a36ebf0536a6705c83c1cbbcb9255fbc1d905a6ded104f479268a29"
->>>>>>> Make html_diff compiles only after stage0
-"checksum clap 2.24.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6b8f69e518f967224e628896b54e41ff6acfb4dcfefc5076325c36525dac900f"
+>>>>>>> Update html-diff-rs dependency
+"checksum clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)" = "867a885995b4184be051b70a592d4d70e32d7a188db6e8dff626af286a962771"
 "checksum cmake 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ebbb35d3dc9cd09497168f33de1acb79b265d350ab0ac34133b98f8509af1f"
-"checksum crates-io 0.10.0 (git+https://github.com/rust-lang/cargo)" = "<none>"
 "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
-"checksum cssparser 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d8e562cb0d6ee9d8c367d3801d4dbaa0a0a94807745f710803b4ec4cf723ddd4"
-"checksum curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c90e1240ef340dd4027ade439e5c7c2064dd9dc652682117bd50d1486a3add7b"
-<<<<<<< HEAD
-"checksum curl-sys 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "23e7e544dc5e1ba42c4a4a678bd47985e84b9c3f4d3404c29700622a029db9c3"
->>>>>>> Add warnings when rustdoc html rendering differs
-<<<<<<< HEAD
->>>>>>> Add warnings when rustdoc html rendering differs
-=======
-=======
-"checksum curl-sys 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)" = "f00c8ba847fb0730c293069b4d1203dc01bf3c2e1f90b4e55f426ed8f4a1eeac"
->>>>>>> Make html_diff compiles only after stage0
->>>>>>> Make html_diff compiles only after stage0
+"checksum cssparser 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef6124306e5ebc5ab11891d063aeafdd0cdc308079b708c8b566125f3680292b"
+"checksum cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "079adec4af52bb5275eadd004292028c79eb3c5f5b4ee8086a36d4197032f6df"
+"checksum curl 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6689276ab61f97c660669a5ecc117c36875dfc1ba301c986b16c653415bdf9d7"
+"checksum curl-sys 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d5481162dc4f424d088581db2f979fa7d4c238fe9794595de61d8d7522e277de"
 "checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850"
 "checksum debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9a032eac705ca39214d169f83e3d3da290af06d8d1d344d1baad2fd002dca4b3"
 "checksum derive-new 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41be6ca3b99e0c0483fb2389685448f650459c3ecbe4e18d7705d8010ec4ab8e"
 "checksum diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0a515461b6c8c08419850ced27bc29e86166dcdcde8fbe76f8b1f0589bb49472"
-<<<<<<< HEAD
 "checksum docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3b5b93718f8b3e5544fcc914c43de828ca6c6ace23e0332c6080a2977b49787a"
-=======
-"checksum docopt 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab32ea6e284d87987066f21a9e809a73c14720571ef34516f0890b3d355ccfd8"
-"checksum docopt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63e408eee8a772c5c61f62353992e3ebf51ef5c832dd04d986b3dc7d48c5b440"
->>>>>>> Make html_diff compiles only after stage0
 "checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90"
-"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
-"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
-"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
-"checksum encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"
-"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
-"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
-"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
 "checksum enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180"
 "checksum env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f"
 "checksum env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b"
@@ -3699,9 +4161,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)" = "36df0166e856739905cd3d7e0b210fe818592211a008862599845e012d8d304c"
 "checksum fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc484842f1e2884faf56f529f960cc12ad8c71ce96cc7abba0a067c98fee344"
 "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
-<<<<<<< HEAD
-<<<<<<< HEAD
 "checksum fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866"
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 "checksum futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4b63a4792d4f8f686defe3b39b92127fea6344de5d38202b2ee5a11bbbf29d6a"
 "checksum gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)" = "120d07f202dcc3f72859422563522b66fe6463a4c513df062874daad05f85f0a"
 =======
@@ -3712,27 +4173,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 =======
 "checksum fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866"
 >>>>>>> Make html_diff compiles only after stage0
+=======
+>>>>>>> Update unstable-crate test
 "checksum futf 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "51f93f3de6ba1794dcd5810b3546d004600a59a98266487c8407bc4b24e398f3"
 "checksum gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)" = "120d07f202dcc3f72859422563522b66fe6463a4c513df062874daad05f85f0a"
-"checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518"
->>>>>>> Add warnings when rustdoc html rendering differs
 "checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685"
 "checksum git2 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aa01936ac96555c083c0e8553f672616274408d9d3fc5b8696603fbf63ff43ee"
 "checksum git2-curl 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "68676bc784bf0bef83278898929bf64a251e87c0340723d0b93fa096c9c5bf8e"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
 "checksum globset 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "feeb1b6840809ef5efcf7a4a990bc4e1b7ee3df8cf9e2379a75aeb2ba42ac9c3"
 "checksum hamcrest 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bf088f042a467089e9baa4972f57f9247e42a0cc549ba264c7a04fbb8ecb89d4"
-<<<<<<< HEAD
 "checksum handlebars 0.26.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fbba80e74e9591a5f6a4ffff6b7f9d645759a896e431cfbdc853e9184370294a"
-=======
-"checksum handlebars 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)" = "15bdf598fc3c2de40c6b340213028301c0d225eea55a2294e6cc148074e557a1"
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> Add warnings when rustdoc html rendering differs
-=======
-<<<<<<< HEAD
->>>>>>> Make html_diff compiles only after stage0
 "checksum hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6a22814455d41612f41161581c2883c0c6a1c41852729b17d5ed88f01e153aa"
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
 <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
 "checksum home 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9f25ae61099d8f3fee8b483df0bd4ecccf4b2731897aad40d50eca1b641fe6db"
 "checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d"
@@ -3749,21 +4202,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 >>>>>>> Add warnings when rustdoc html rendering differs
 =======
 =======
+=======
+>>>>>>> Update unstable-crate test
 "checksum hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6a22814455d41612f41161581c2883c0c6a1c41852729b17d5ed88f01e153aa"
 "checksum html-diff 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8dcd098ed53623fb0f855acab766fced3353a5723314edeb0dad39720f26fed5"
 "checksum html5ever 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d60508177ec4e5774a112efcf4d4d5f123cb00a43476fa5940b7da568371a165"
 "checksum html5ever-atoms 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c626dc6733babf7110d3a5078b1529e9d0eaaacf6c488ef6a7437b7d515844bb"
+=======
+"checksum html-diff 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "17dbc64943cae56925cf9ff22e8c76ccdb8010f6675a1a56660ec7e597ffa7c7"
+"checksum html5ever 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a49d5001dd1bddf042ea41ed4e0a671d50b1bf187e66b349d7ec613bdce4ad90"
+>>>>>>> Update html-diff-rs dependency
 "checksum idna 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2233d4940b1f19f0418c158509cd7396b8d70a5db5705ce410914dc8fa603b37"
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+=======
+>>>>>>> Update unstable-crate test
 "checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c"
 "checksum jobserver 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "443ae8bc0af6c106e6e8b77e04684faecc1a5ce94e058f4c2b0a037b0ea1b133"
 "checksum jsonrpc-core 7.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "903e5eee845f3d83c1436d12848d97b1247cf850ff06a8e1db2f1ce3543af2cf"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
 <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
 "checksum languageserver-types 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d52e477b23bf52cd3ca0f9fc6c5d14be954eec97e3b9cdfbd962d911bd533caf"
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 "checksum languageserver-types 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "680aee78c75504fdcb172635a7b7da0dccaafa4c42d935e19576c14b27942362"
 =======
 <<<<<<< HEAD
@@ -3773,7 +4237,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum languageserver-types 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97c2985bfcbbcb0189cfa25e1c10c1ac7111df2b6214b652c690127aefdf4e5b"
 >>>>>>> Add warnings when rustdoc html rendering differs
 >>>>>>> Add warnings when rustdoc html rendering differs
+<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2
 >>>>>>> Add warnings when rustdoc html rendering differs
+=======
+=======
+"checksum kuchiki 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "529eda79bcc5e2803758350b2748600a595268fa892a6d1ba1657ee992c6cc18"
+"checksum languageserver-types 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c178b944c3187527293fb9f8a0b0db3c5fb62eb127cacd65296f651a2440f5b1"
+>>>>>>> Update unstable check test
+>>>>>>> Update unstable check test
 "checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
 <<<<<<< HEAD
 "checksum libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)" = "8a014d9226c2cc402676fbe9ea2e15dd5222cd1dd57f576b5b283178c944a264"
@@ -3782,42 +4253,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)" = "719aa0af4c241fa71d396ffdfe584aa758f08f35b4680ec3f03ecc2c3fe69b76"
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 "checksum libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)" = "30885bcb161cf67054244d10d4a7f4835ffd58773bc72e07d35fecf472295503"
 =======
 <<<<<<< HEAD
+=======
+>>>>>>> Update unstable-crate test
 "checksum libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)" = "38f5c2b18a287cf78b4097db62e20f43cace381dc76ae5c0a3073067f78b7ddc"
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
 "checksum libgit2-sys 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "df18a822100352d9863b302faf6f8f25c0e77f0e60feb40e5dbe1238b7f13b1d"
 "checksum libssh2-sys 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0db4ec23611747ef772db1c4d650f8bd762f07b461727ec998f953c614024b75"
-<<<<<<< HEAD
 "checksum libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdd64ef8ee652185674455c1d450b83cbc8ad895625d543b5324d923f82e4d8"
 "checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b"
+<<<<<<< HEAD
 "checksum lzma-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "66b2e318eb97ab84f05725471f90c52a09c964053a5899a13fd0165acc26d00b"
+=======
+"checksum lzma-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "013fa6506eb7d26040c46dab9ecb7ccb4e2896b5bf24a9d65932501ea9f67af8"
+<<<<<<< HEAD
+>>>>>>> Update unstable-crate test
 "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376"
 <<<<<<< HEAD
 "checksum mdbook 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "22911d86cde6f80fa9f0fb2a68bbbde85d97af4fe0ce267141c83a4187d28700"
 =======
 =======
-"checksum libz-sys 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e5ee912a45d686d393d5ac87fac15ba0ba18daae14e8e7543c63ebf7fb7e970c"
-"checksum log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5141eca02775a762cc6cd564d8d2c50f67c0ea3a372cbf1c51592b3e029e10ad"
-"checksum lzma-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fedff6a5cbb24494ec6ee4784e9ac5c187161fede04c7767d49bf87544013afa"
-"checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
-"checksum matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "efd7622e3022e1a6eaa602c4cea8912254e5582c9c692e9167714182244801b1"
->>>>>>> Add warnings when rustdoc html rendering differs
+>>>>>>> Update html-diff-rs dependency
 =======
-"checksum libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)" = "e7eb6b826bfc1fdea7935d46556250d1799b7fe2d9f7951071f4291710665e3e"
+"checksum kuchiki 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ef2ea4f2f7883cd7c6772b06c14abca01a2cc1f75c426cebffcf6b3b925ef9fc"
+"checksum languageserver-types 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "680aee78c75504fdcb172635a7b7da0dccaafa4c42d935e19576c14b27942362"
+"checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
+"checksum libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)" = "30885bcb161cf67054244d10d4a7f4835ffd58773bc72e07d35fecf472295503"
+>>>>>>> Update html-diff-rs dependency
 "checksum libgit2-sys 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "df18a822100352d9863b302faf6f8f25c0e77f0e60feb40e5dbe1238b7f13b1d"
 "checksum libssh2-sys 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0db4ec23611747ef772db1c4d650f8bd762f07b461727ec998f953c614024b75"
-"checksum libz-sys 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "e70195f655a44af531ad7135b1ec2a0a82522b451fe09730fbb25674a85996e7"
+"checksum libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdd64ef8ee652185674455c1d450b83cbc8ad895625d543b5324d923f82e4d8"
 "checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b"
 "checksum lzma-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "013fa6506eb7d26040c46dab9ecb7ccb4e2896b5bf24a9d65932501ea9f67af8"
 "checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
+"checksum markup5ever 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5050cc22c1d567a9b99bcbe9ffbd8f3127b3d146994105480240dc8ba4f4f2ef"
 "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376"
->>>>>>> Make html_diff compiles only after stage0
-"checksum mdbook 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)" = "f1e2e9d848514dcfad4195788d0d42ae5153a477c191d75d5b84fab10f222fbd"
->>>>>>> Add warnings when rustdoc html rendering differs
+"checksum mdbook 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "22911d86cde6f80fa9f0fb2a68bbbde85d97af4fe0ce267141c83a4187d28700"
 "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 miniz-sys 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "28eaee17666671fa872e567547e8428e83308ebe5808cdf6a0e28397dbe2c726"
@@ -3844,8 +4321,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum num-iter 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)" = "f7d1891bd7b936f12349b7d1403761c8a0b85a18b148e9da4429d5d102c1a41e"
 "checksum num-rational 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "33c881e104a26e1accc09449374c095ff2312c8e0c27fab7bbefe16eac7c776d"
 "checksum num-traits 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "1708c0628602a98b52fad936cf3edb9a107af06e52e49fdf0707e884456a6af6"
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 <<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+>>>>>>> Update unstable-crate test
 "checksum num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584"
 "checksum open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3478ed1686bd1300c8a981a940abc92b06fac9cbef747f4c668d4e032ff7b842"
 "checksum openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)" = "085aaedcc89a2fac1eb2bc19cd66f29d4ea99fec60f82a5f3a88a6be7dbd90b5"
@@ -3857,6 +4337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "ad95f8160d1c150c4f44d4c4959732e048ac046c37f597fe362f8bf57561ffb4"
 =======
 "checksum openssl-sys 0.9.14 (registry+https://github.com/rust-lang/crates.io-index)" = "236c718c2e2c2b58a546d86ffea5194400bb15dbe01ca85325ffd357b03cf66c"
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 =======
 "checksum num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6e416ba127a4bb3ff398cb19546a8d0414f73352efe2857f4060d36f5fe5983a"
 "checksum open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3478ed1686bd1300c8a981a940abc92b06fac9cbef747f4c668d4e032ff7b842"
@@ -3865,7 +4346,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e035022a50faa380bd7ccdbd184d946ce539ebdb0a358780de92a995882af97a"
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
 "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
 "checksum percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de154f638187706bde41d9b4738748933d64e6b37bdbffc0b47a97d16a6ae356"
 "checksum pest 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0a6dda33d67c26f0aac90d324ab2eb7239c819fc7b2552fe9faa4fe88441edc8"
@@ -3874,6 +4360,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6b07ffcc532ccc85e3afc45865469bf5d9e4ef5bfcf9622e3cfe80c2d275ec03"
 "checksum phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "07e24b0ca9643bdecd0632f2b3da6b1b89bbb0030e0b992afc1113b23a7bc2f2"
 "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903"
+"checksum precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf1fc3616b3ef726a847f2cd2388c646ef6a1f1ba4835c2629004da48184150"
+"checksum procedural-masquerade 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c93cdc1fb30af9ddf3debc4afbdb0f35126cbd99daa229dd76cdd5349b41d989"
 "checksum psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "abcd5d1a07d360e29727f757a9decb3ce8bc6e0efa8969cfaad669a8317a2478"
 "checksum pulldown-cmark 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9ab1e588ef8efd702c7ed9d2bd774db5e6f4d878bb5a1a9f371828fbdff6973"
 "checksum quick-error 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c36987d4978eb1be2e422b1e0423a557923a5c3e7e6f31d5699e9aafaefa469"
@@ -3881,6 +4369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "checksum racer 2.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "f120c7510ef7aff254aeb06067fb6fac573ec96a1660e194787cf9dced412bf0"
 =======
 =======
@@ -3899,8 +4388,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 =======
 "checksum racer 2.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "edf2dfc188373ef96168bec3646a0415c5c21111c6144c0c36104fc720587ecd"
 >>>>>>> Make html_diff compiles only after stage0
+=======
+"checksum racer 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9079a128fdb6f0c8850010e1478b215d4c00134654bf995bfda41824951ce9bd"
+>>>>>>> Update unstable-crate test
 "checksum rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "022e0636ec2519ddae48154b028864bdce4eaf7d35226ab8e65c611be97b189d"
-"checksum ref_slice 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "825740057197b7d43025e7faf6477eaabc03434e153233da02d1f44602f71527"
 "checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
 "checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b"
 "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
@@ -3911,7 +4402,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ffd34691a510938bb67fe0444fb363103c73ffb31c121d1e16bc92d8945ea8ff"
 "checksum rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e"
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
+<<<<<<< HEAD
+<<<<<<< HEAD
 "checksum rustfmt-nightly 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6eea0d0590ae793fc4d281df56e01dc7531575c8ed9a72fadf5fdc7305a0d32f"
+=======
+=======
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+>>>>>>> Update html-diff-rs dependency
+<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2
+"checksum rustfmt-nightly 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa1ffc66e1e1786355f22e8a958a57bd67fbf9564f522f87f31de9586715f8f6"
+=======
+<<<<<<< HEAD
+"checksum rustfmt-nightly 0.1.8 (git+https://github.com/rust-lang-nursery/rustfmt?branch=rustfmt-42492)" = "<none>"
+=======
+"checksum rustfmt-nightly 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ccadd3e5b64b339456f2b8accac5d11423aca8e4fc9140d0fff4bfca4e67e5b3"
+>>>>>>> Update unstable check test
+>>>>>>> Update unstable check test
+>>>>>>> Update unstable check test
 "checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7"
 "checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d"
 <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
@@ -3923,13 +4430,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum selectors 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cc733b58ea460d56f470ace2ecdd6e0bd724499a1d495998706537b01630390f"
 "checksum semver 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdd61b85a0fa777f7fb7c454b9189b2941b110d1385ce84d7f76efdf1606a85"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+<<<<<<< HEAD
 "checksum serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f7726f29ddf9731b17ff113c461e362c381d9d69433f79de4f3dd572488823e9"
 "checksum serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cf823e706be268e73e7747b147aa31c8f633ab4ba31f115efb57e5047c3a76dd"
+=======
+<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2
+"checksum serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "433d7d9f8530d5a939ad5e0e72a6243d2e42a24804f70bf592c679363dcacb2f"
+"checksum serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "7b707cf0d4cab852084f573058def08879bb467fda89d99052485e7d00edd624"
+=======
+<<<<<<< HEAD
+=======
+"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
+>>>>>>> Update unstable check test
+"checksum serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6a7c6b751a2e8d5df57a5ff71b5b4fc8aaee9ee28ff1341d640dd130bb5f4f7a"
+"checksum serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "2f6ca58905ebd3c3b285a8a6d4f3ac92b92c0d7951d5649b1bdd212549c06639"
+>>>>>>> Update unstable check test
+<<<<<<< HEAD
+>>>>>>> Update unstable check test
+=======
+=======
+"checksum rustfmt-nightly 0.1.8 (git+https://github.com/rust-lang-nursery/rustfmt?branch=rustfmt-42492)" = "<none>"
+"checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7"
+"checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d"
+"checksum selectors 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3c89b1c6a3c029c82263f7dd2d44d0005ee7374eb09e254ab59dede4353a8c0"
+"checksum semver 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdd61b85a0fa777f7fb7c454b9189b2941b110d1385ce84d7f76efdf1606a85"
+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+"checksum serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "433d7d9f8530d5a939ad5e0e72a6243d2e42a24804f70bf592c679363dcacb2f"
+"checksum serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "7b707cf0d4cab852084f573058def08879bb467fda89d99052485e7d00edd624"
+>>>>>>> Update html-diff-rs dependency
+>>>>>>> Update html-diff-rs dependency
 "checksum serde_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37aee4e0da52d801acfbc0cc219eb1eda7142112339726e427926a6f6ee65d3a"
 "checksum serde_ignored 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c10e798e4405d7dcec3658989e35ee6706f730a9ed7c1184d5ebd84317e82f46"
 "checksum serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "48b04779552e92037212c3615370f6bd57a40ebba7f20e554ff9f55e41a69a7b"
 "checksum shell-escape 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "dd5cc96481d54583947bfe88bf30c23d53f883c6cd0145368b69989d97b84ef8"
 <<<<<<< HEAD
+<<<<<<< HEAD
 "checksum socket2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4daf80fcf54186fac4fe049e0b39d36a5cfde69a11a06413e61e77f553cccf9a"
 =======
 <<<<<<< HEAD
@@ -3938,27 +4473,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537"
 >>>>>>> Add warnings when rustdoc html rendering differs
 >>>>>>> Add warnings when rustdoc html rendering differs
-"checksum stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "15132e0e364248108c5e2c02e3ab539be8d6f5d52a01ca9bbf27ed657316f02b"
-<<<<<<< HEAD
-<<<<<<< HEAD
-"checksum strings 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da75d8bf2c4d210d63dd09581a041b036001f9f6e03d9b151dbff810fb7ba26a"
-<<<<<<< HEAD
 =======
-"checksum strsim 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "67f84c44fbb2f91db7fef94554e6b2ac05909c9c0b0bc23bb98d3a1aebfe7f7c"
-=======
-=======
->>>>>>> Make html_diff compiles only after stage0
-"checksum string_cache 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c19dbe4d2552673a8c4ec0e91523670ee2b73ba3560d935703ce5d64a40f864c"
-"checksum string_cache_codegen 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0c9dfe1a7c8bba1ecb90730d269fdc08afe93d23c28dd6c4aa5cabd79a05a05e"
+"checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537"
+"checksum smallvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4f8266519bc1d17d0b5b16f6c21295625d562841c708f6376f49028a43e9c11e"
+"checksum socket2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "12cdbddbaa27bf94cc194b8e37f5811db6fe83cea96cf99cf1f8e92b65a41371"
+>>>>>>> Update unstable-crate test
+"checksum stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "15132e0e364248108c5e2c02e3ab539be8d6f5d52a01ca9bbf27ed657316f02b"
+"checksum string_cache 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2fa69b90c5398217fb0414706d1becea9325ad21ed5d87bd6dda82127911f324"
+"checksum string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "479cde50c3539481f33906a387f2bd17c8e87cb848c35b6021d41fb81ff9b4d7"
 "checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"
 "checksum strings 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da75d8bf2c4d210d63dd09581a041b036001f9f6e03d9b151dbff810fb7ba26a"
-<<<<<<< HEAD
->>>>>>> Add warnings when rustdoc html rendering differs
->>>>>>> Add warnings when rustdoc html rendering differs
-=======
->>>>>>> Make html_diff compiles only after stage0
 "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694"
-"checksum syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)" = "58fd09df59565db3399efbba34ba8a2fec1307511ebd245d0061ff9d42691673"
 "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
 "checksum syn 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6ae6fb0dcc9bd85f89a1a4adc0df2fd90c90c98849d61433983dd7a9df6363f7"
 "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
@@ -3967,21 +4492,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum syntex_syntax 0.52.0 (registry+https://github.com/rust-lang/crates.io-index)" = "76a302e717e348aa372ff577791c3832395650073b8d8432f8b3cb170b34afde"
 "checksum tar 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "281285b717926caa919ad905ef89c63d75805c7d89437fb873100925a53f2b1b"
 "checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6"
-<<<<<<< HEAD
+"checksum tendril 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1b72f8e2f5b73b65c315b1a70c730f24b9d7a25f39e98de8acbe2bb795caea"
 "checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
 "checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209"
 "checksum termcolor 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5193a56b8d82014662c4b933dea6bec851daf018a2b01722e007daaf5f9dca"
 <<<<<<< HEAD
+<<<<<<< HEAD
 "checksum textwrap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f728584ea33b0ad19318e20557cb0a39097751dbb07171419673502f848c7af6"
 =======
 <<<<<<< HEAD
 "checksum textwrap 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f86300c3e7416ee233abd7cda890c492007a3980f941f79185c753a701257167"
 =======
 =======
+=======
+>>>>>>> Update unstable-crate test
 "checksum tendril 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4ce04c250d202db8004921e3d3bc95eaa4f2126c6937a428ae39d12d0e38df62"
-"checksum term 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d168af3930b369cfe245132550579d47dfd873d69470755a19c2c6568dbbd989"
+"checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
 "checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209"
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> Add warnings when rustdoc html rendering differs
 <<<<<<< HEAD
 >>>>>>> Add warnings when rustdoc html rendering differs
@@ -3993,12 +4522,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum termcolor 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5193a56b8d82014662c4b933dea6bec851daf018a2b01722e007daaf5f9dca"
 >>>>>>> Make html_diff compiles only after stage0
 >>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
 >>>>>>> Make html_diff compiles only after stage0
+=======
+=======
+"checksum termcolor 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5193a56b8d82014662c4b933dea6bec851daf018a2b01722e007daaf5f9dca"
+>>>>>>> Update unstable-crate test
+>>>>>>> Update unstable-crate test
+=======
+"checksum textwrap 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f86300c3e7416ee233abd7cda890c492007a3980f941f79185c753a701257167"
+>>>>>>> Update html-diff-rs dependency
 "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
 "checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
 "checksum thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14"
 "checksum toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4"
 <<<<<<< HEAD
+<<<<<<< HEAD
 "checksum toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7540f4ffc193e0d3c94121edb19b055670d369f77d5804db11ae053a45b6e7e"
 "checksum typed-arena 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5934776c3ac1bea4a9d56620d6bf2d483b20d394e49581db40f187e1118ff667"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
@@ -4009,13 +4548,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 =======
 "checksum toml 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bd86ad9ebee246fdedd610e0f6d0587b754a3d81438db930a244d0480ed7878f"
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> Add warnings when rustdoc html rendering differs
+=======
+>>>>>>> Update unstable-crate test
+=======
+>>>>>>> Update html-diff-rs dependency
 "checksum toml 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b0601da6c97135c8d330c7a13a013ca6cd4143221b01de2f8d4edc50a9e551c7"
 "checksum typed-arena 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5934776c3ac1bea4a9d56620d6bf2d483b20d394e49581db40f187e1118ff667"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f"
-<<<<<<< HEAD
 "checksum unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18127285758f0e2c6cf325bb3f3d138a12fee27de4f23e146cd6a179f26c2cf3"
+<<<<<<< HEAD
 =======
 =======
 "checksum toml 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4cc5dbfb20a481e64b99eb7ae280859ec76730c7191570ba5edaa962394edb0a"
@@ -4023,23 +4567,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a6a2c4e3710edd365cd7e78383153ed739fa31af19f9172f72d3575060f5a43a"
 "checksum unicode-normalization 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e28fa37426fceeb5cf8f41ee273faa7c82c47dc8fba5853402841e665fcd86ff"
 >>>>>>> Add warnings when rustdoc html rendering differs
+=======
+>>>>>>> Update unstable-crate test
 "checksum unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8083c594e02b8ae1654ae26f0ade5158b119bd88ad0e8227a5d8fcd72407946"
 >>>>>>> Add warnings when rustdoc html rendering differs
 >>>>>>> Add warnings when rustdoc html rendering differs
+=======
+>>>>>>> Update html-diff-rs dependency
 "checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f"
 "checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb"
 "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
-<<<<<<< HEAD
-"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
-=======
 "checksum unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91"
-<<<<<<< HEAD
->>>>>>> Make html_diff compiles only after stage0
+"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb819346883532a271eb626deb43c4a1bb4c4dd47c519bd78137c3e72a4fe27"
-=======
-"checksum url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a69a2e36a5e5ed3f3063c8c64a3b028c4d50d689fa6c862abd7cfe65f882595c"
->>>>>>> Make html_diff compiles only after stage0
 "checksum url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74e7d099f1ee52f823d4bdd60c93c3602043c728f5db3b97bdb548467f7bddea"
+<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
+<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
 <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
 "checksum userenv-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71d28ea36bbd9192d75bd9fa9b39f96ddb986eaee824adae5d53b6e51919b2f3"
 =======
@@ -4050,24 +4593,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b"
 =======
 "checksum user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47"
+=======
+>>>>>>> Update unstable-crate test
 "checksum utf-8 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9aee9ba280438b56d1ebc5329f2094f0ff457f811eeeff0b278d75aa99db400"
+=======
+"checksum utf-8 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b6f923c601c7ac48ef1d66f7d5b5b2d9a7ba9c51333ab75a3ddf8d0309185a56"
+>>>>>>> Update html-diff-rs dependency
 "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"
-<<<<<<< HEAD
->>>>>>> Add warnings when rustdoc html rendering differs
-=======
-"checksum vcpkg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df74ff70e2ced9607f67e06640f89a6a6374b459b51bdef290a5cfa657fe4fcc"
->>>>>>> Make html_diff compiles only after stage0
+"checksum vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b"
 "checksum vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff"
 "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"
-<<<<<<< HEAD
 "checksum wincolor 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a39ee4464208f6430992ff20154216ab2357772ac871d994c51628d60e58b8b0"
-=======
-"checksum wincolor 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "99c2af1426e2166e6f66d88b09b2a4d63afce06875f149174e386f2f1ee9779b"
->>>>>>> Make html_diff compiles only after stage0
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
 "checksum xattr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "5f04de8a1346489a2f9e9bd8526b73d135ec554227b17568456e86aa35b6f3fc"
 "checksum xz2 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e9510bdf100731599107c61f77daf46713a69a568f75458999c1f9dbf6ba25b0"
diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml
index c6a7cec52ff..96fdf6dfa55 100644
--- a/src/librustdoc/Cargo.toml
+++ b/src/librustdoc/Cargo.toml
@@ -13,8 +13,8 @@ env_logger = { version = "0.4", default-features = false }
 log = "0.3"
 pulldown-cmark = { version = "0.0.14", default-features = false }
 
-[target.'cfg(not(stage0))'.dependencies]
-html-diff = "0.0.2"
+[target.'cfg(not(any(stage0, stage1)))'.dependencies]
+html-diff = "0.0.3"
 
 [build-dependencies]
 build_helper = { path = "../build_helper" }
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 27c67e2a4bc..ae4f75efd5a 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -75,7 +75,7 @@ use html::item_type::ItemType;
 use html::markdown::{self, Markdown, MarkdownHtml, MarkdownSummaryLine, RenderType};
 use html::{highlight, layout};
 
-#[cfg(not(stage0))]
+#[cfg(not(any(stage0, stage1)))]
 use html_diff;
 
 /// A pair of name and its optional document.
@@ -1648,7 +1648,7 @@ fn document(w: &mut fmt::Formatter, cx: &Context, item: &clean::Item) -> fmt::Re
     Ok(())
 }
 
-#[cfg(not(stage0))]
+#[cfg(not(any(stage0, stage1)))]
 fn get_html_diff(w: &mut fmt::Formatter, md_text: &str, render_type: RenderType,
                  prefix: &str) -> fmt::Result {
     if render_type == RenderType::Pulldown {
@@ -1671,9 +1671,10 @@ fn get_html_diff(w: &mut fmt::Formatter, md_text: &str, render_type: RenderType,
     }
 }
 
-#[cfg(stage0)]
-fn get_html_diff(w: &mut fmt::Formatter, md_text: &str, render_type: RenderType) -> fmt::Result {
-    write!(w, "<div class='docblock'>{}</div>", Markdown(md_text, render_type))
+#[cfg(any(stage0, stage1))]
+fn get_html_diff(w: &mut fmt::Formatter, md_text: &str, render_type: RenderType,
+                 prefix: &str) -> fmt::Result {
+    write!(w, "<div class='docblock'>{}{}</div>", prefix, Markdown(md_text, render_type))
 }
 
 fn document_short(w: &mut fmt::Formatter, item: &clean::Item, link: AssocItemLink,
@@ -1685,7 +1686,7 @@ fn document_short(w: &mut fmt::Formatter, item: &clean::Item, link: AssocItemLin
         } else {
             format!("{}", &plain_summary_line(Some(s)))
         };
-        get_html_diff(&markdown, render_type, prefix)?;
+        get_html_diff(w, &markdown, render_type, prefix)?;
     } else if !prefix.is_empty() {
         write!(w, "<div class='docblock'>{}</div>", prefix)?;
     }
@@ -1709,7 +1710,7 @@ fn render_assoc_const_value(item: &clean::Item) -> String {
 fn document_full(w: &mut fmt::Formatter, item: &clean::Item,
                  render_type: RenderType, prefix: &str) -> fmt::Result {
     if let Some(s) = item.doc_value() {
-        get_html_diff(format!("{}{}", md_render_assoc_item(item), s), render_type, prefix)?;
+        get_html_diff(w, s, render_type, prefix)?;
     } else if !prefix.is_empty() {
         write!(w, "<div class='docblock'>{}</div>", prefix)?;
     }
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index d45513489ab..cc7893c227c 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -28,7 +28,7 @@
 extern crate arena;
 extern crate getopts;
 extern crate env_logger;
-#[cfg(not(stage0))]
+#[cfg(not(any(stage0, stage1)))]
 extern crate html_diff;
 extern crate libc;
 extern crate rustc;
diff --git a/src/test/run-make/sysroot-crates-are-unstable/Makefile b/src/test/run-make/sysroot-crates-are-unstable/Makefile
index 4b7052f9b94..63fa7e3a0f1 100644
--- a/src/test/run-make/sysroot-crates-are-unstable/Makefile
+++ b/src/test/run-make/sysroot-crates-are-unstable/Makefile
@@ -1,35 +1,4 @@
--include ../tools.mk
+PYTHON=python
 
-# This is a whitelist of files which are stable crates or simply are not crates,
-# we don't check for the instability of these crates as they're all stable!
-STABLE_CRATES := \
-	std \
-	core \
-	proc_macro \
-	rsbegin.o \
-	rsend.o \
-	dllcrt2.o \
-	crt2.o \
-	clang_rt.%_dynamic.dylib
-
-# Generate a list of all crates in the sysroot. To do this we list all files in
-# rustc's sysroot, look at the filename, strip everything after the `-`, and
-# strip the leading `lib` (if present)
-SYSROOT := $(shell $(RUSTC) --print sysroot)
-LIBS := $(wildcard $(SYSROOT)/lib/rustlib/$(TARGET)/lib/*)
-LIBS := $(foreach lib,$(LIBS),$(notdir $(lib)))
-LIBS := $(foreach lib,$(LIBS),$(word 1,$(subst -, ,$(lib))))
-LIBS := $(foreach lib,$(LIBS),$(patsubst lib%,%,$(lib)))
-LIBS := $(filter-out $(STABLE_CRATES),$(LIBS))
-
-all: $(foreach lib,$(LIBS),check-crate-$(lib)-is-unstable)
-
-check-crate-%-is-unstable:
-	@echo verifying $* is an unstable crate
-	@echo 'extern crate $*;' | \
-		$(RUSTC) - --crate-type rlib 2>&1 | cat > $(TMPDIR)/$*; \
-		true
-	@grep -q 'use of unstable library feature' $(TMPDIR)/$* || \
-		(echo crate $* is not unstable && \
-		cat $(TMPDIR)/$* && \
-		false)
+all:
+	python test.py
diff --git a/src/test/run-make/sysroot-crates-are-unstable/test.py b/src/test/run-make/sysroot-crates-are-unstable/test.py
new file mode 100644
index 00000000000..210059e1010
--- /dev/null
+++ b/src/test/run-make/sysroot-crates-are-unstable/test.py
@@ -0,0 +1,71 @@
+# Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+
+import sys
+import os
+from os import listdir
+from os.path import isfile, join
+from subprocess import PIPE, Popen
+
+
+# This is a whitelist of files which are stable crates or simply are not crates,
+# we don't check for the instability of these crates as they're all stable!
+STABLE_CRATES = ['std', 'core', 'proc_macro', 'rsbegin.o', 'rsend.o', 'dllcrt2.o', 'crt2.o',
+                 'clang_rt']
+
+
+def convert_to_string(s):
+    if s.__class__.__name__ == 'bytes':
+        return s.decode('utf-8')
+    return s
+
+
+def exec_command(command, to_input=None):
+    child = None
+    if to_input is None:
+        child = Popen(command, stdout=PIPE, stderr=PIPE)
+    else:
+        child = Popen(command, stdout=PIPE, stderr=PIPE, stdin=PIPE)
+    stdout, stderr = child.communicate(input=to_input)
+    return (convert_to_string(stdout), convert_to_string(stderr))
+
+
+def check_lib(lib):
+    if lib['name'] in STABLE_CRATES:
+        return True
+    print('verifying if {} is an unstable crate'.format(lib['name']))
+    stdout, stderr = exec_command([os.environ['RUSTC'], '-', '--crate-type', 'rlib',
+                                   '--extern', '{}={}'.format(lib['name'], lib['path'])],
+                                  to_input='extern crate {};'.format(lib['name']))
+    if not 'use of unstable library feature' in '{}{}'.format(stdout, stderr):
+        print('crate {} "{}" is not unstable'.format(lib['name'], lib['path']))
+        print('{}{}'.format(stdout, stderr))
+        print('')
+        return False
+    return True
+
+# Generate a list of all crates in the sysroot. To do this we list all files in
+# rustc's sysroot, look at the filename, strip everything after the `-`, and
+# strip the leading `lib` (if present)
+def get_all_libs(dir_path):
+    return [{ 'path': join(dir_path, f), 'name': f[3:].split('-')[0] }
+            for f in listdir(dir_path)
+            if isfile(join(dir_path, f)) and f.endswith('.rlib') and f not in STABLE_CRATES]
+
+
+sysroot = exec_command([os.environ['RUSTC'], '--print', 'sysroot'])[0].replace('\n', '')
+libs = get_all_libs(join(sysroot, 'lib/rustlib/{}/lib'.format(os.environ['TARGET'])))
+
+ret = 0
+for lib in libs:
+    if not check_lib(lib):
+        # We continue so users can see all the not unstable crates.
+        ret = 1
+sys.exit(ret)
diff --git a/src/test/rustdoc/issue-12834.rs b/src/test/rustdoc/issue-12834.rs
index 48d63d9566a..30dce27e738 100644
--- a/src/test/rustdoc/issue-12834.rs
+++ b/src/test/rustdoc/issue-12834.rs
@@ -15,7 +15,7 @@
 // @has issue_12834/fn.foo.html
 // @has - //pre 'a + b '
 
-/// ```text
+/// ```
 /// a + b ∈ Self ∀ a, b ∈ Self
 /// ```
 pub fn foo() {}