Add warnings when rustdoc html rendering differs

diff --git a/src/Cargo.lock b/src/Cargo.lock
index ad96ff40cd687804f405e4f155343652be806890..e0e603e616fedb6f7be8ba6600c33a26008a2190 100644 (file)
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -80,7 +80,38 @@ version = "0.2.2"
 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.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
+ "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)",
+=======
+=======
+>>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+ "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Add warnings when rustdoc html rendering differs
+<<<<<<< HEAD
+>>>>>>> Add warnings when rustdoc html rendering differs
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+>>>>>>> Add warnings when rustdoc html rendering differs
+<<<<<<< HEAD
+>>>>>>> Add warnings when rustdoc html rendering differs
+=======
+=======
+=======
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -93,8 +124,28 @@ dependencies = [
  "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "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
  "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)",
+=======
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
+ "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)",
 ]
 
@@ -104,7 +155,23 @@ version = "0.1.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)",
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -139,13 +206,33 @@ 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)",
+<<<<<<< 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)",
  "num_cpus 1.6.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)",
+<<<<<<< HEAD
  "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+ "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
+ "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
+>>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -175,13 +262,32 @@ dependencies = [
 
 [[package]]
 name = "cargo"
+<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
 version = "0.22.0"
 source = "git+https://github.com/rust-lang/cargo#bcf3997b1fa177afc5b6c632a6fbbf6cc75df427"
 replace = "cargo 0.22.0"
+=======
+<<<<<<< HEAD
+version = "0.21.0"
+source = "git+https://github.com/rust-lang/cargo#1566c92b5d28e435613918e59dc94755f99d73b1"
+replace = "cargo 0.21.0"
+=======
+version = "0.20.0"
+<<<<<<< HEAD
+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
 
 [[package]]
 name = "cargo"
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
 version = "0.22.0"
+=======
+version = "0.21.0"
+=======
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
 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)",
@@ -190,8 +296,17 @@ 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)",
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "curl 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< HEAD
+ "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)",
@@ -201,6 +316,7 @@ 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)",
@@ -211,7 +327,25 @@ dependencies = [
  "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.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< HEAD
  "openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "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)",
+=======
+ "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)",
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
  "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)",
@@ -223,9 +357,58 @@ 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)",
 ]
 
@@ -239,10 +422,49 @@ dependencies = [
  "git2 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "hamcrest 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< HEAD
+ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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)",
+ "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< HEAD
+ "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Make html_diff compiles only after stage0
+ "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)",
+=======
+<<<<<<< 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)",
  "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
+ "serde 1.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
  "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
 ]
 
 [[package]]
@@ -302,8 +524,18 @@ 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
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 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
+>>>>>>> Make html_diff compiles only after stage0
  "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)",
 ]
@@ -345,7 +577,24 @@ 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]]
@@ -353,22 +602,66 @@ name = "crossbeam"
 version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "cssparser"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.6 (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)",
+]
+
 [[package]]
 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
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 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
+ "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
+>>>>>>> Make html_diff compiles only after stage0
  "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)",
  "socket2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+ "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)",
+=======
+ "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)",
+ "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)",
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
  "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)",
@@ -377,6 +670,17 @@ 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)",
 ]
 
@@ -389,6 +693,14 @@ dependencies = [
  "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "debug_unreachable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "derive-new"
 version = "0.3.0"
@@ -410,8 +722,39 @@ 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)",
+<<<<<<< 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)",
+=======
+<<<<<<< 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
+ "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
+ "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)",
+=======
+ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
+ "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "docopt"
+version = "0.8.0"
+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)",
+ "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)",
  "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -420,6 +763,63 @@ name = "dtoa"
 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"
@@ -474,7 +874,31 @@ name = "filetime"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "flate"
+version = "0.0.0"
+dependencies = [
+ "build_helper 0.1.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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -494,7 +918,23 @@ name = "flate2"
 version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
  "miniz-sys 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -518,14 +958,40 @@ version = "0.4.2"
 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.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
+<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
 name = "futures"
 version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+=======
+name = "futf"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+>>>>>>> Add warnings when rustdoc html rendering differs
 
 [[package]]
 name = "gcc"
@@ -543,11 +1009,31 @@ version = "0.6.6"
 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
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
  "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]]
@@ -558,7 +1044,11 @@ 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]]
@@ -610,10 +1100,53 @@ 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"
+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)",
+]
+
+[[package]]
+name = "html5ever"
+version = "0.13.1"
+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)",
+ "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"
@@ -639,9 +1172,20 @@ 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]]
@@ -696,7 +1240,23 @@ name = "jobserver"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
  "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -721,6 +1281,19 @@ dependencies = [
  "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "kuchiki"
+version = "0.4.3"
+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)",
+ "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)",
+]
+
 [[package]]
 name = "languageserver-types"
 version = "0.12.0"
@@ -730,7 +1303,11 @@ 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)",
 ]
 
@@ -748,7 +1325,23 @@ dependencies = [
 
 [[package]]
 name = "libc"
+<<<<<<< HEAD
 version = "0.2.29"
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+version = "0.2.27"
+=======
+<<<<<<< HEAD
+version = "0.2.26"
+=======
+<<<<<<< HEAD
+version = "0.2.24"
+=======
+version = "0.2.23"
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -757,12 +1350,33 @@ 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)",
  "libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< HEAD
  "openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "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)",
+=======
+ "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)",
+ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libssh2-sys 0.2.6 (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
+>>>>>>> Make html_diff compiles only after stage0
  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -772,14 +1386,39 @@ version = "0.2.6"
 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
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Make html_diff compiles only after stage0
  "libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< HEAD
  "openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+ "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
+ "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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
  "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 = [
@@ -787,6 +1426,15 @@ 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]]
@@ -805,8 +1453,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 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
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
-]
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
+]
+
+[[package]]
+name = "mac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "matches"
@@ -818,9 +1487,31 @@ name = "mdbook"
 version = "0.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+<<<<<<< HEAD
  "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
+ "clap 2.25.1 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< HEAD
+ "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)",
@@ -835,7 +1526,23 @@ name = "memchr"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -843,7 +1550,23 @@ name = "memchr"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -852,7 +1575,23 @@ version = "0.1.9"
 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.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -877,7 +1616,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 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
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
  "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)",
 ]
@@ -950,10 +1705,29 @@ 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
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< HEAD
+ "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)",
+=======
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -967,14 +1741,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "openssl"
+<<<<<<< HEAD
 version = "0.9.17"
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+version = "0.9.15"
+=======
+<<<<<<< HEAD
+version = "0.9.14"
+=======
+version = "0.9.13"
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> 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 = [
  "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
  "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)",
+=======
+=======
+<<<<<<< 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
+ "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
+ "openssl-sys 0.9.14 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -984,11 +1792,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "openssl-sys"
+<<<<<<< HEAD
 version = "0.9.17"
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+version = "0.9.15"
+>>>>>>> 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)",
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+ "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< HEAD
+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)",
+=======
+ "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+version = "0.9.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gdi32-sys 0.2.0 (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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
  "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)",
 ]
@@ -1029,6 +1866,40 @@ name = "pest"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "phf"
+version = "0.7.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.7.21"
+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)",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.7.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.7.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "pkg-config"
 version = "0.3.9"
@@ -1085,11 +1956,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "racer"
+<<<<<<< HEAD
+<<<<<<< HEAD
 version = "2.0.10"
+=======
+=======
+>>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
+version = "2.0.9"
+=======
+version = "2.0.7"
+>>>>>>> Add warnings when rustdoc html rendering differs
+<<<<<<< HEAD
+>>>>>>> Add warnings when rustdoc html rendering differs
+=======
+=======
+version = "2.0.8"
+>>>>>>> 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 = [
  "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
+ "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
  "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)",
@@ -1109,10 +2004,16 @@ name = "rand"
 version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
+<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
 name = "reformat"
 version = "0.1.0"
 
@@ -1121,6 +2022,34 @@ name = "reformat_with_range"
 version = "0.1.0"
 
 [[package]]
+=======
+=======
+<<<<<<< HEAD
+ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+=======
+>>>>>>> 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
+]
+
+[[package]]
+name = "ref_slice"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+>>>>>>> Add warnings when rustdoc html rendering differs
+>>>>>>> Add warnings when rustdoc html rendering differs
+=======
+>>>>>>> Make html_diff compiles only after stage0
 name = "regex"
 version = "0.1.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1172,21 +2101,108 @@ version = "0.1.0"
 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
  "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)",
+=======
+<<<<<<< 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)",
+ "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.9 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< HEAD
+>>>>>>> Add warnings when rustdoc html rendering differs
  "rls-analysis 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rls-data 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+ "rls-analysis 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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
+ "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)",
+=======
+ "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
+=======
+ "racer 2.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rls-analysis 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rls-data 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Add warnings when rustdoc html rendering differs
+>>>>>>> Add warnings when rustdoc html rendering differs
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+>>>>>>> Add warnings when rustdoc html rendering differs
+<<<<<<< HEAD
+>>>>>>> Add warnings when rustdoc html rendering differs
+=======
+=======
+=======
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
  "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)",
  "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)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "rustfmt-nightly 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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)",
+=======
+ "rustfmt-nightly 0.1.8 (git+https://github.com/rust-lang-nursery/rustfmt?branch=rustfmt-42492)",
+ "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
+ "rls-vfs 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
  "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)",
 ]
 
@@ -1228,7 +2244,24 @@ name = "rls-vfs"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+<<<<<<< HEAD
+<<<<<<< HEAD
  "racer 2.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+=======
+>>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
+ "racer 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+ "racer 2.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Add warnings when rustdoc html rendering differs
+<<<<<<< HEAD
+>>>>>>> Add warnings when rustdoc html rendering differs
+=======
+=======
+ "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
  "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1248,7 +2281,14 @@ dependencies = [
  "flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "fmt_macros 0.0.0",
  "graphviz 0.0.0",
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "jobserver 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< HEAD
+ "jobserver 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> 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)",
  "rustc_back 0.0.0",
@@ -1458,7 +2498,11 @@ 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",
@@ -1555,7 +2599,19 @@ name = "rustc_save_analysis"
 version = "0.0.0"
 dependencies = [
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< HEAD
  "rls-data 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "rls-data 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< HEAD
+ "rls-data 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
  "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)",
@@ -1569,9 +2625,22 @@ dependencies = [
 name = "rustc_trans"
 version = "0.0.0"
 dependencies = [
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+ "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)",
  "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "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)",
+=======
+ "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
  "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)",
@@ -1633,9 +2702,27 @@ 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)",
  "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)",
 ]
 
@@ -1647,24 +2734,95 @@ dependencies = [
 ]
 
 [[package]]
+<<<<<<< HEAD
 name = "rustfmt-nightly"
+<<<<<<< HEAD
 version = "0.2.2"
+=======
+<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
+version = "0.2.1"
+>>>>>>> Add warnings when rustdoc html rendering differs
+source = "registry+https://github.com/rust-lang/crates.io-index"
+=======
+<<<<<<< HEAD
+version = "0.1.8"
+source = "git+https://github.com/rust-lang-nursery/rustfmt?branch=rustfmt-42492#7333dfc95b4af5c7283ba03f33c50f108d2be3f5"
+=======
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+=======
+name = "rustfmt"
+version = "0.9.0"
+source = "git+https://github.com/rust-lang-nursery/rustfmt?branch=libsyntax#6c1de7694782d9f710b2f00b1f650f266a99b384"
+<<<<<<< HEAD
+=======
+version = "0.8.4"
+source = "git+https://github.com/rust-lang-nursery/rustfmt#c0fae6a82a4cea3320f6e35432a4fc6bbad6b0f9"
+>>>>>>> Add warnings when rustdoc html rendering differs
+>>>>>>> Add warnings when rustdoc html rendering differs
+<<<<<<< HEAD
+>>>>>>> Add warnings when rustdoc html rendering differs
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+>>>>>>> Add warnings when rustdoc html rendering differs
+=======
+=======
+=======
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
 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
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
  "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
+=======
+ "syntex_errors 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Add warnings when rustdoc html rendering differs
+=======
+>>>>>>> Make html_diff compiles only after stage0
+ "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
+ "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
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1682,6 +2840,17 @@ name = "scoped-tls"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "selectors"
+version = "0.15.2"
+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)",
+ "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)",
+]
+
 [[package]]
 name = "scopeguard"
 version = "0.1.2"
@@ -1754,6 +2923,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
+<<<<<<< HEAD
 name = "socket2"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1764,6 +2934,11 @@ 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"
@@ -1802,6 +2977,39 @@ dependencies = [
  "core 0.0.0",
 ]
 
+[[package]]
+name = "string_cache"
+version = "0.4.0"
+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)",
+ "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "string_cache_codegen"
+version = "0.3.1"
+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)",
+ "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "string_cache_shared"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "strings"
 version = "0.1.0"
@@ -1811,6 +3019,7 @@ 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"
@@ -1824,6 +3033,15 @@ dependencies = [
  "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[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"
@@ -1879,7 +3097,23 @@ name = "syntex_errors"
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
  "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)",
@@ -1901,7 +3135,23 @@ version = "0.52.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)",
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
  "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)",
@@ -1916,7 +3166,23 @@ version = "0.4.13"
 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
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
  "xattr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1928,6 +3194,17 @@ dependencies = [
  "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tendril"
+version = "0.2.4"
+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)",
+]
+
 [[package]]
 name = "term"
 version = "0.0.0"
@@ -1947,7 +3224,23 @@ version = "0.3.0"
 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.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1956,7 +3249,11 @@ 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]]
@@ -1982,10 +3279,42 @@ version = "2.0.0"
 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.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+]
+
+[[package]]
+<<<<<<< HEAD
+=======
+name = "thread-id"
+version = "3.1.0"
+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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[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"
@@ -2029,7 +3358,24 @@ 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)",
@@ -2037,7 +3383,11 @@ 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]]
@@ -2069,10 +3419,20 @@ 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]]
@@ -2080,9 +3440,18 @@ name = "url"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
  "idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< HEAD
+ "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]]
@@ -2095,12 +3464,24 @@ dependencies = [
 ]
 
 [[package]]
+<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
 name = "userenv-sys"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+name = "utf-8"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Add warnings when rustdoc html rendering differs
+=======
+ "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+>>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -2115,7 +3496,11 @@ 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]]
@@ -2150,7 +3535,11 @@ 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)",
@@ -2171,7 +3560,23 @@ name = "xattr"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+<<<<<<< HEAD
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+ "libc 0.2.27 (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)",
+=======
+ "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
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -2194,26 +3599,97 @@ 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"
+<<<<<<< HEAD
+<<<<<<< HEAD
 "checksum backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "72f9b4182546f4b04ebc4ab7f84948953a118bd6021a1b6a6c909e3e94f6be76"
+<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
 "checksum backtrace-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "afccc5772ba333abccdf60d55200fa3406f8c59dcf54d5f7998c9107d3799c7c"
+=======
+"checksum backtrace-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3a0d842ea781ce92be2bf78a9b38883948542749640b8378b3b2f03d1fd9f1ff"
+<<<<<<< HEAD
+=======
+=======
+"checksum backtrace 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f551bc2ddd53aea015d453ef0b635af89444afa5ed2405dd0b2062ad5d600d80"
+"checksum backtrace-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d192fd129132fbc97497c1f2ec2c2c5174e376b95f535199ef4fe0a293d33842"
+>>>>>>> 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"
+>>>>>>> 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 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"
+<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
 "checksum cargo 0.22.0 (git+https://github.com/rust-lang/cargo)" = "<none>"
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+"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"
 "checksum clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2267a8fdd4dce6956ba6649e130f62fb279026e5e84b92aa939ac8f85ce3f9f0"
 "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"
+<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
 "checksum curl 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7034c534a1d7d22f7971d6088aa9d281d219ef724026c3428092500f41ae9c2c"
+=======
+"checksum curl 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6689276ab61f97c660669a5ecc117c36875dfc1ba301c986b16c653415bdf9d7"
+<<<<<<< HEAD
+>>>>>>> Add warnings when rustdoc html rendering differs
 "checksum curl-sys 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d5481162dc4f424d088581db2f979fa7d4c238fe9794595de61d8d7522e277de"
+=======
+"checksum curl-sys 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "cbd8b8d593de3bbf49252b92f398ef47f0c6c1ebdfd0f9282b9b9348aad8d71c"
+=======
+"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"
+=======
+"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"
+"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 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"
@@ -2223,39 +3699,135 @@ 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"
 "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"
+=======
+"checksum fs2 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "34edaee07555859dc13ca387e6ae05686bb4d0364c95d649b6dab959511f4baf"
+<<<<<<< HEAD
+"checksum gcc 0.3.50 (registry+https://github.com/rust-lang/crates.io-index)" = "5f837c392f2ea61cb1576eac188653df828c861b7137d74ea4a5caa89621f9e6"
+=======
+=======
+"checksum fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866"
+>>>>>>> Make html_diff compiles only after stage0
+"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"
+<<<<<<< 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"
 "checksum ignore 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b3fcaf2365eb14b28ec7603c98c06cc531f19de9eb283d89a3dff8417c8c99f5"
+=======
+"checksum idna 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2233d4940b1f19f0418c158509cd7396b8d70a5db5705ce410914dc8fa603b37"
+=======
+"checksum html-diff 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d583b05cfbed6c646ff0484e2adf3ecde689e36afae42328844471496f659dc3"
+"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 idna 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6ac85ec3f80c8e4e99d9325521337e14ec7555c458a14e377d189659a427f375"
+>>>>>>> Add warnings when rustdoc html rendering differs
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+>>>>>>> Add warnings when rustdoc html rendering differs
+=======
+=======
+"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 idna 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2233d4940b1f19f0418c158509cd7396b8d70a5db5705ce410914dc8fa603b37"
+>>>>>>> Make html_diff compiles only after stage0
+>>>>>>> Make html_diff compiles only after stage0
 "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"
+<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
 "checksum languageserver-types 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d52e477b23bf52cd3ca0f9fc6c5d14be954eec97e3b9cdfbd962d911bd533caf"
+=======
+<<<<<<< HEAD
+"checksum languageserver-types 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "680aee78c75504fdcb172635a7b7da0dccaafa4c42d935e19576c14b27942362"
+=======
+<<<<<<< HEAD
+"checksum languageserver-types 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c178b944c3187527293fb9f8a0b0db3c5fb62eb127cacd65296f651a2440f5b1"
+=======
+"checksum kuchiki 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "529eda79bcc5e2803758350b2748600a595268fa892a6d1ba1657ee992c6cc18"
+"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
+>>>>>>> Add warnings when rustdoc html rendering differs
 "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"
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+"checksum libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)" = "719aa0af4c241fa71d396ffdfe584aa758f08f35b4680ec3f03ecc2c3fe69b76"
+=======
+<<<<<<< HEAD
+"checksum libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)" = "30885bcb161cf67054244d10d4a7f4835ffd58773bc72e07d35fecf472295503"
+=======
+<<<<<<< HEAD
+"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
+>>>>>>> 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"
 "checksum lzma-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "66b2e318eb97ab84f05725471f90c52a09c964053a5899a13fd0165acc26d00b"
 "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
+=======
+"checksum libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)" = "e7eb6b826bfc1fdea7935d46556250d1799b7fe2d9f7951071f4291710665e3e"
+"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 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 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 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"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
+<<<<<<< HEAD
 "checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09"
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+"checksum net2 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)" = "94101fd932816f97eb9a5116f6c1a11511a1fed7db21c5ccd823b2dc11abf566"
+>>>>>>> Make html_diff compiles only after stage0
 "checksum num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "a311b77ebdc5dd4cf6449d81e4135d9f0e3b153839ac90e648a8ef538f923525"
 "checksum num-bigint 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "8fd0f8dbb4c0960998958a796281d88c16fbe68d87b1baa6f31e2979e81fd0bd"
 "checksum num-complex 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "503e668405c5492d67cf662a81e05be40efe2e6bcf10f7794a07bd9865e704e6"
@@ -2263,22 +3835,72 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum num-iter 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "7485fcc84f85b4ecd0ea527b14189281cf27d60e583ae65ebc9c088b13dffe01"
 "checksum num-rational 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "288629c76fac4b33556f4b7ab57ba21ae202da65ba8b77466e6d598e31990790"
 "checksum num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "99843c856d68d8b4313b03a17e33c4bb42ae8f6610ea81b28abe076ac721b9b0"
+=======
+"checksum net2 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)" = "bc01404e7568680f1259aa5729539f221cb1e6d047a0d9053cab4be8a73b5d67"
+"checksum num 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "2c3a3dc9f30bf824141521b30c908a859ab190b76e20435fcd89f35eb6583887"
+"checksum num-bigint 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "6361748d02e5291c72a422dc8ed4d8464a80cb1e618971f6fffe6d52d97e3286"
+"checksum num-complex 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "412dfc143c56579aa6a22c574e38ddbf724522f1280ae2b257498cccff3fb6af"
+"checksum num-integer 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)" = "ef1a4bf6f9174aa5783a9b4cc892cacd11aebad6c69ad027a0b65c6ca5f8aa37"
+"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"
+<<<<<<< HEAD
+>>>>>>> Make html_diff compiles only after stage0
 "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"
 "checksum openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d98df0270d404ccd3c050a41d579c52d1db15375168bb3471e04ec0f5f378daf"
+<<<<<<< HEAD
 "checksum openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7e3a9845a4c9fdb321931868aae5549e96bb7b979bf9af7de03603d74691b5f3"
+=======
+<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
+"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"
+=======
+"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"
+"checksum openssl 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b34cd77cf91301fff3123fbd46b065c3b728b17a392835de34c397315dce5586"
+"checksum openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d98df0270d404ccd3c050a41d579c52d1db15375168bb3471e04ec0f5f378daf"
+"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
+>>>>>>> Make html_diff compiles only after stage0
 "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"
+"checksum phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "cb325642290f28ee14d8c6201159949a872f220c62af6e110a56ea914fbe42fc"
+"checksum phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d62594c0bb54c464f633175d502038177e90309daf2e0158be42ed5f023ce88f"
+"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 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"
 "checksum quote 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4c5cf478fe1006dbcc72567121d23dbdae5f1632386068c5c86ff4f645628504"
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
+<<<<<<< HEAD
+<<<<<<< HEAD
 "checksum racer 2.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "f120c7510ef7aff254aeb06067fb6fac573ec96a1660e194787cf9dced412bf0"
+=======
+=======
+>>>>>>> Make html_diff compiles only after stage0
+<<<<<<< HEAD
+"checksum racer 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9079a128fdb6f0c8850010e1478b215d4c00134654bf995bfda41824951ce9bd"
+=======
+"checksum racer 2.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b0abeec93a76199a95a2455ecd169555081a62f490c9fc5500f9645558030dc7"
+>>>>>>> Add warnings when rustdoc html rendering differs
+<<<<<<< HEAD
+>>>>>>> Add warnings when rustdoc html rendering differs
+"checksum rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "022e0636ec2519ddae48154b028864bdce4eaf7d35226ab8e65c611be97b189d"
+<<<<<<< HEAD
+=======
+>>>>>>> Make html_diff compiles only after stage0
+=======
+"checksum racer 2.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "edf2dfc188373ef96168bec3646a0415c5c21111c6144c0c36104fc720587ecd"
+>>>>>>> Make html_diff compiles only after stage0
 "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"
@@ -2292,8 +3914,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rustfmt-nightly 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6eea0d0590ae793fc4d281df56e01dc7531575c8ed9a72fadf5fdc7305a0d32f"
 "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
 "checksum scopeguard 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "59a076157c1e2dc561d8de585151ee6965d910dd4dcb5dabb7ae3e83981a6c57"
 "checksum semver 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdd61b85a0fa777f7fb7c454b9189b2941b110d1385ce84d7f76efdf1606a85"
+=======
+=======
+>>>>>>> Make html_diff compiles only after stage0
+"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"
 "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"
@@ -2301,10 +3929,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "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
 "checksum socket2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4daf80fcf54186fac4fe049e0b39d36a5cfde69a11a06413e61e77f553cccf9a"
+=======
+<<<<<<< HEAD
+"checksum socket2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "12cdbddbaa27bf94cc194b8e37f5811db6fe83cea96cf99cf1f8e92b65a41371"
+=======
+"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 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"
@@ -2313,35 +3967,107 @@ 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 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
 "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"
+=======
+=======
+"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_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209"
+<<<<<<< HEAD
+>>>>>>> Add warnings when rustdoc html rendering differs
+<<<<<<< HEAD
+>>>>>>> Add warnings when rustdoc html rendering differs
+<<<<<<< HEAD
+>>>>>>> Add warnings when rustdoc html rendering differs
+=======
+=======
+=======
+"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
+>>>>>>> Make html_diff compiles only after stage0
 "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
 "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"
 "checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f"
 "checksum unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8083c594e02b8ae1654ae26f0ade5158b119bd88ad0e8227a5d8fcd72407946"
+=======
+<<<<<<< HEAD
+=======
+"checksum toml 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bd86ad9ebee246fdedd610e0f6d0587b754a3d81438db930a244d0480ed7878f"
+<<<<<<< HEAD
+>>>>>>> Add warnings when rustdoc html rendering differs
+"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"
+=======
+=======
+"checksum toml 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4cc5dbfb20a481e64b99eb7ae280859ec76730c7191570ba5edaa962394edb0a"
+"checksum typed-arena 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5934776c3ac1bea4a9d56620d6bf2d483b20d394e49581db40f187e1118ff667"
+"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
+"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
 "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 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"
+<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
 "checksum userenv-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71d28ea36bbd9192d75bd9fa9b39f96ddb986eaee824adae5d53b6e51919b2f3"
+=======
+<<<<<<< HEAD
+>>>>>>> Add warnings when rustdoc html rendering differs
 "checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
 "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122"
 "checksum 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"
+"checksum utf-8 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9aee9ba280438b56d1ebc5329f2094f0ff457f811eeeff0b278d75aa99db400"
+"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 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 f9400e68a16c58d2c15a527207758794d5685027..c6a7cec52ff90de3f24861f40dc6b509c890f0eb 100644 (file)
--- a/src/librustdoc/Cargo.toml
+++ b/src/librustdoc/Cargo.toml
@@ -13,6 +13,9 @@ 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"
+
 [build-dependencies]
 build_helper = { path = "../build_helper" }
 gcc = "0.3.50"

diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 5457f69cb6dab02bf9c3d420a83f94533909e4c7..27c67e2a4bc3a47c33cc8105c9b60bda1892506a 100644 (file)
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -75,6 +75,9 @@
 use html::markdown::{self, Markdown, MarkdownHtml, MarkdownSummaryLine, RenderType};
 use html::{highlight, layout};
 
+#[cfg(not(stage0))]
+use html_diff;
+
 /// A pair of name and its optional document.
 pub type NameDoc = (String, Option<String>);
 
@@ -1645,6 +1648,34 @@ fn document(w: &mut fmt::Formatter, cx: &Context, item: &clean::Item) -> fmt::Re
     Ok(())
 }
 
+#[cfg(not(stage0))]
+fn get_html_diff(w: &mut fmt::Formatter, md_text: &str, render_type: RenderType,
+                 prefix: &str) -> fmt::Result {
+    if render_type == RenderType::Pulldown {
+        let output = format!("{}", Markdown(md_text, render_type));
+        let old = format!("{}", Markdown(md_text, RenderType::Hoedown));
+        let differences = html_diff::get_differences(&output, &old);
+        if !differences.is_empty() {
+            println!("Differences spotted in {:?}:\n{}",
+                     md_text,
+                     differences.iter()
+                                .map(|s| format!("=> {}", s.to_string()))
+                                .collect::<Vec<String>>()
+                                .join("\n"));
+        }
+        write!(w, "<div class='docblock'>{}{}</div>", prefix, output)
+    } else {
+        write!(w, "<div class='docblock'>{}{}</div>",
+               prefix,
+               Markdown(md_text, render_type))
+    }
+}
+
+#[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))
+}
+
 fn document_short(w: &mut fmt::Formatter, item: &clean::Item, link: AssocItemLink,
                   render_type: RenderType, prefix: &str) -> fmt::Result {
     if let Some(s) = item.doc_value() {
@@ -1654,7 +1685,7 @@ fn document_short(w: &mut fmt::Formatter, item: &clean::Item, link: AssocItemLin
         } else {
             format!("{}", &plain_summary_line(Some(s)))
         };
-        write!(w, "<div class='docblock'>{}{}</div>", prefix, Markdown(&markdown, render_type))?;
+        get_html_diff(&markdown, render_type, prefix)?;
     } else if !prefix.is_empty() {
         write!(w, "<div class='docblock'>{}</div>", prefix)?;
     }
@@ -1678,7 +1709,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() {
-        write!(w, "<div class='docblock'>{}{}</div>", prefix, Markdown(s, render_type))?;
+        get_html_diff(format!("{}{}", md_render_assoc_item(item), 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 61a8165d26af16283b3cc49f85f538d47b71f791..d45513489ab46422f89ef24b4d3e36749c16886a 100644 (file)
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -28,6 +28,8 @@
 extern crate arena;
 extern crate getopts;
 extern crate env_logger;
+#[cfg(not(stage0))]
+extern crate html_diff;
 extern crate libc;
 extern crate rustc;
 extern crate rustc_data_structures;

diff --git a/src/test/rustdoc/issue-12834.rs b/src/test/rustdoc/issue-12834.rs
index 30dce27e7389474b386fcdfcb2a5c7da3981cf1a..48d63d9566a6202f49e18d03a5dc8c21f8ecb2e4 100644 (file)
--- 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() {}