Remove some false positive issues

author: Guillaume Gomez <guillaume1.gomez@gmail.com> 2017-08-27 12:40:56 +0200
committer: Guillaume Gomez <guillaume1.gomez@gmail.com> 2017-08-30 11:46:58 +0200
commit: 9b26f3ad25bc9603ace18931eada23438f3b64d7 (patch)
tree: 20082beba3e1d4bcd2ce53b2f922a4110d440aca
parent: bba7fd9dd54937719a6e88c954db7ab2ea5a3541 (diff)
download: rust-9b26f3ad25bc9603ace18931eada23438f3b64d7.tar.gz
rust-9b26f3ad25bc9603ace18931eada23438f3b64d7.zip
5 files changed, 23 insertions, 1080 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock
index 99aa3b6da23..607ca6be57b 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -94,52 +94,7 @@ dependencies = [
  "dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
-<<<<<<< HEAD
  "rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-=======
-=======
-<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
->>>>>>> Update html-diff-rs dependency
-<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
- "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-<<<<<<< HEAD
- "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
-<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
->>>>>>> Make html_diff compiles only after stage0
-<<<<<<< HEAD
->>>>>>> Make html_diff compiles only after stage0
-=======
-=======
-=======
- "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update unstable-crate test
->>>>>>> Update unstable-crate test
-<<<<<<< HEAD
->>>>>>> Update unstable-crate test
-=======
-=======
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update html-diff-rs dependency
->>>>>>> Update html-diff-rs dependency
-=======
- "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
- "rustc-demangle 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
-=======
- "rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Print warning whatever the rendering mode
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -186,42 +141,11 @@ dependencies = [
  "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "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)",
-<<<<<<< HEAD
  "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
-=======
->>>>>>> Update to last master
-<<<<<<< HEAD
- "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
-=======
->>>>>>> Print warning whatever the rendering mode
- "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
- "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
-=======
- "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.4 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
-=======
- "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Print warning whatever the rendering mode
 ]
 
 [[package]]
@@ -239,15 +163,7 @@ version = "0.1.0"
 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)",
-<<<<<<< HEAD
-<<<<<<< HEAD
- "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "toml 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
-=======
  "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Print warning whatever the rendering mode
 ]
 
 [[package]]
@@ -260,15 +176,7 @@ dependencies = [
 [[package]]
 name = "cargo"
 version = "0.22.0"
-<<<<<<< HEAD
-<<<<<<< HEAD
-source = "git+https://github.com/rust-lang/cargo#bcf3997b1fa177afc5b6c632a6fbbf6cc75df427"
-=======
-source = "git+https://github.com/rust-lang/cargo#305bc25d5e105e84ffe261655b46cf74570f6e5b"
->>>>>>> Update to last master
-=======
-source = "git+https://github.com/rust-lang/cargo#668d55cc6d54c7e9635c924c252621f5e6664e00"
->>>>>>> Print warning whatever the rendering mode
+source = "git+https://github.com/rust-lang/cargo#3d3f2c05d742e5f907e951aa8849b03f0bc1a895"
 replace = "cargo 0.22.0"
 
 [[package]]
@@ -303,39 +211,7 @@ 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
-<<<<<<< HEAD
-<<<<<<< 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)",
-<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
-=======
- "jobserver 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "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
-<<<<<<< HEAD
->>>>>>> Make html_diff compiles only after stage0
-=======
-=======
->>>>>>> Update unstable-crate test
->>>>>>> Update unstable-crate test
-=======
- "openssl 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
-=======
- "openssl 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Print warning whatever the rendering mode
  "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)",
@@ -348,15 +224,7 @@ dependencies = [
  "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)",
-<<<<<<< HEAD
-<<<<<<< HEAD
  "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "toml 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
-=======
- "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Print warning whatever the rendering mode
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -371,22 +239,10 @@ 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)",
- "libc 0.2.29 (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.11 (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)",
- "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
 ]
 
 [[package]]
@@ -537,27 +393,8 @@ dependencies = [
  "curl-sys 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
-<<<<<<< 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)",
-<<<<<<< HEAD
-=======
- "curl-sys 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
- "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
-=======
->>>>>>> Update unstable-crate test
-=======
- "openssl-sys 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "socket2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Print warning whatever the rendering mode
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -569,11 +406,7 @@ dependencies = [
  "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)",
  "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.16 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Print warning whatever the rendering mode
  "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)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -622,66 +455,14 @@ 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
-<<<<<<< HEAD
-<<<<<<< HEAD
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-=======
-<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
->>>>>>> Update html-diff-rs dependency
-<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
- "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-<<<<<<< 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)",
-=======
->>>>>>> Update unstable-crate test
- "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update unstable check test
-=======
- "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update html-diff-rs dependency
-=======
- "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)",
->>>>>>> Update to last master
  "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "dtoa"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -797,7 +578,7 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -819,11 +600,7 @@ dependencies = [
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "libgit2-sys 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "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)",
-=======
- "openssl-sys 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Print warning whatever the rendering mode
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -985,7 +762,7 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1002,7 +779,7 @@ name = "jsonrpc-core"
 version = "7.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.15 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1070,37 +847,7 @@ dependencies = [
  "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
-<<<<<<< HEAD
-<<<<<<< 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)",
-<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
-=======
- "curl-sys 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "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
-<<<<<<< HEAD
->>>>>>> Make html_diff compiles only after stage0
-=======
-=======
->>>>>>> Update unstable-crate test
->>>>>>> Update unstable-crate test
-=======
- "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
-=======
- "openssl-sys 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Print warning whatever the rendering mode
  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1111,48 +858,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cmake 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
->>>>>>> Update html-diff-rs dependency
-<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
- "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
-<<<<<<< HEAD
  "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)",
-=======
->>>>>>> Update to last master
-=======
- "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
- "libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
- "openssl-sys 0.9.14 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
-=======
- "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
- "libz-sys 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
->>>>>>> Make html_diff compiles only after stage0
-<<<<<<< HEAD
->>>>>>> Make html_diff compiles only after stage0
-=======
-=======
->>>>>>> Update unstable-crate test
->>>>>>> Update unstable-crate test
-=======
- "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
-=======
- "libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Print warning whatever the rendering mode
  "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1231,26 +938,7 @@ name = "mdbook"
 version = "0.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-=======
-<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
->>>>>>> Update html-diff-rs dependency
-<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
- "clap 2.25.1 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-<<<<<<< HEAD
-=======
->>>>>>> Update html-diff-rs dependency
- "clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Add warnings when rustdoc html rendering differs
->>>>>>> Add warnings when rustdoc html rendering differs
-=======
  "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
  "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)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1259,15 +947,7 @@ dependencies = [
  "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_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
-<<<<<<< HEAD
  "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "toml 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
-=======
- "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Print warning whatever the rendering mode
 ]
 
 [[package]]
@@ -1407,93 +1087,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "openssl"
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 version = "0.9.17"
-=======
-=======
-<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
->>>>>>> Update unstable-crate test
-<<<<<<< 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
-<<<<<<< HEAD
->>>>>>> Make html_diff compiles only after stage0
-=======
-=======
-version = "0.9.14"
->>>>>>> Update unstable-crate test
->>>>>>> Update unstable-crate test
-=======
-version = "0.9.15"
->>>>>>> Update to last master
-=======
-version = "0.9.16"
->>>>>>> Print warning whatever the rendering mode
 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)",
  "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
-<<<<<<< HEAD
  "openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-=======
-=======
-<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
->>>>>>> Update html-diff-rs dependency
-<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
- "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-<<<<<<< HEAD
-=======
->>>>>>> Update unstable-crate test
- "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
- "openssl-sys 0.9.14 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
-=======
- "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
->>>>>>> Make html_diff compiles only after stage0
-<<<<<<< HEAD
->>>>>>> Make html_diff compiles only after stage0
-=======
-=======
->>>>>>> Update unstable-crate test
-<<<<<<< HEAD
->>>>>>> Update unstable-crate test
-=======
-=======
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.14 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update html-diff-rs dependency
->>>>>>> Update html-diff-rs dependency
-=======
- "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
- "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
-=======
- "openssl-sys 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Print warning whatever the rendering mode
 ]
 
 [[package]]
@@ -1503,72 +1104,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "openssl-sys"
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 version = "0.9.17"
-=======
-=======
-<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
->>>>>>> Update unstable-crate test
-<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
-=======
->>>>>>> Update to last master
-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
-<<<<<<< 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
-=======
->>>>>>> Update unstable-crate test
-version = "0.9.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
-=======
- "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
-=======
-version = "0.9.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-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
-<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
->>>>>>> Make html_diff compiles only after stage0
-<<<<<<< HEAD
->>>>>>> Make html_diff compiles only after stage0
-=======
-=======
-=======
->>>>>>> Update unstable-crate test
->>>>>>> Update unstable-crate test
->>>>>>> Update unstable-crate test
-=======
->>>>>>> Update html-diff-rs dependency
-=======
- "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
-=======
-version = "0.9.16"
 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.29 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Print warning whatever the rendering mode
  "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)",
 ]
@@ -1709,50 +1249,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "racer"
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< 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
-=======
-version = "2.0.9"
->>>>>>> Update unstable-crate test
-=======
-version = "2.0.10"
->>>>>>> Update to last master
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
->>>>>>> Make html_diff compiles only after stage0
->>>>>>> Make html_diff compiles only after stage0
-=======
- "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update unstable-crate test
-=======
->>>>>>> Update to last master
  "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)",
@@ -1836,99 +1337,20 @@ 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
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
  "jsonrpc-core 7.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "languageserver-types 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "racer 2.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-=======
-<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
->>>>>>> Update html-diff-rs dependency
-<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
-=======
->>>>>>> Update to last master
- "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)",
-<<<<<<< HEAD
- "racer 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
->>>>>>> Add warnings when rustdoc html rendering differs
-=======
- "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)",
->>>>>>> Print warning whatever the rendering mode
  "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-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
-<<<<<<< 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)",
-<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-<<<<<<< HEAD
-=======
->>>>>>> Update unstable-crate test
- "rls-vfs 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
- "rustfmt-nightly 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Make html_diff compiles only after stage0
-<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2
->>>>>>> Make html_diff compiles only after stage0
-<<<<<<< HEAD
->>>>>>> Make html_diff compiles only after stage0
-=======
-=======
-=======
- "rustfmt-nightly 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update unstable check test
->>>>>>> Update unstable check test
-<<<<<<< HEAD
->>>>>>> Update unstable check test
-=======
-=======
- "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update html-diff-rs dependency
->>>>>>> Update html-diff-rs dependency
- "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "rustfmt-nightly 0.2.1 (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.4 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
-=======
  "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Print warning whatever the rendering mode
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1971,32 +1393,7 @@ name = "rls-vfs"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< 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
-=======
- "racer 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update unstable-crate test
-=======
- "racer 2.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
  "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2417,19 +1814,7 @@ dependencies = [
 
 [[package]]
 name = "rustfmt-nightly"
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 version = "0.2.2"
-=======
-=======
-<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
->>>>>>> Update html-diff-rs dependency
-<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
-=======
->>>>>>> Update to last master
-version = "0.2.1"
->>>>>>> Add warnings when rustdoc html rendering differs
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2444,41 +1829,8 @@ dependencies = [
  "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)",
  "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< 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)",
- "unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
-=======
-=======
-<<<<<<< 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
-=======
->>>>>>> Update unstable-crate test
- "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Add warnings when rustdoc html rendering differs
->>>>>>> Add warnings when rustdoc html rendering differs
-=======
->>>>>>> Update html-diff-rs dependency
-=======
- "toml 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Print warning whatever the rendering mode
- "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2532,37 +1884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-version = "1.0.11"
-=======
-=======
-<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
->>>>>>> Update html-diff-rs dependency
-<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2
-version = "1.0.10"
-=======
-<<<<<<< HEAD
-=======
-version = "0.9.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "serde"
->>>>>>> Update unstable check test
-version = "1.0.9"
->>>>>>> Update unstable check test
-<<<<<<< HEAD
->>>>>>> Update unstable check test
-=======
-=======
-version = "1.0.10"
->>>>>>> Update html-diff-rs dependency
->>>>>>> Update html-diff-rs dependency
-=======
 version = "1.0.11"
->>>>>>> Update to last master
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -2589,43 +1911,7 @@ name = "serde_ignored"
 version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-=======
-<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
->>>>>>> Update html-diff-rs dependency
-<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2
- "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
- "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
-=======
-]
-
-[[package]]
-name = "serde_json"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update unstable check test
->>>>>>> Update unstable check test
-<<<<<<< HEAD
->>>>>>> Update unstable check test
-=======
-=======
- "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update html-diff-rs dependency
->>>>>>> Update html-diff-rs dependency
-=======
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
 ]
 
 [[package]]
@@ -2633,21 +1919,10 @@ name = "serde_json"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
-<<<<<<< HEAD
-<<<<<<< HEAD
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
-=======
-=======
- "num-traits 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update html-diff-rs dependency
- "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update html-diff-rs dependency
-=======
- "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
->>>>>>> Update to last master
 ]
 
 [[package]]
@@ -2972,15 +2247,7 @@ dependencies = [
 
 [[package]]
 name = "toml"
-<<<<<<< HEAD
-<<<<<<< HEAD
-version = "0.4.5"
-=======
-version = "0.4.4"
->>>>>>> Update to last master
-=======
 version = "0.4.5"
->>>>>>> Print warning whatever the rendering mode
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3182,49 +2449,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f382711e76b9de6c744cc00d0497baba02fb00a787f088c879f01d09468e32"
 "checksum cargo 0.22.0 (git+https://github.com/rust-lang/cargo)" = "<none>"
 "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 "checksum clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2267a8fdd4dce6956ba6649e130f62fb279026e5e84b92aa939ac8f85ce3f9f0"
-=======
-=======
-<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
->>>>>>> Update html-diff-rs dependency
-<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2
-"checksum clap 2.25.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7f1aabf260a8f3fefa8871f16b531038c98dd9eab1cfa2c575e78c459abfa3a0"
->>>>>>> Update unstable check test
 "checksum cmake 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ebbb35d3dc9cd09497168f33de1acb79b265d350ab0ac34133b98f8509af1f"
+"checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299"
 "checksum core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5909502e547762013619f4c4e01cc7393c20fe2d52d7fa471c1210adb2320dc7"
 "checksum core-foundation-sys 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bc9fb3d6cb663e6fd7cf1c63f9b144ee2b1e4a78595a0451dd34bff85b9a3387"
 "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
-<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
-<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
-"checksum curl 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7034c534a1d7d22f7971d6088aa9d281d219ef724026c3428092500f41ae9c2c"
-=======
-=======
-<<<<<<< HEAD
->>>>>>> Update unstable-crate test
-"checksum curl 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6689276ab61f97c660669a5ecc117c36875dfc1ba301c986b16c653415bdf9d7"
-<<<<<<< HEAD
->>>>>>> Add warnings when rustdoc html rendering differs
-"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"
-=======
->>>>>>> Update unstable check test
-<<<<<<< HEAD
-=======
->>>>>>> Update html-diff-rs dependency
-"checksum clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)" = "867a885995b4184be051b70a592d4d70e32d7a188db6e8dff626af286a962771"
-=======
-"checksum clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2267a8fdd4dce6956ba6649e130f62fb279026e5e84b92aa939ac8f85ce3f9f0"
->>>>>>> Update to last master
-"checksum cmake 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ebbb35d3dc9cd09497168f33de1acb79b265d350ab0ac34133b98f8509af1f"
-"checksum conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299"
-"checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
 "checksum cssparser 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef6124306e5ebc5ab11891d063aeafdd0cdc308079b708c8b566125f3680292b"
 "checksum cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "079adec4af52bb5275eadd004292028c79eb3c5f5b4ee8086a36d4197032f6df"
 "checksum curl 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7034c534a1d7d22f7971d6088aa9d281d219ef724026c3428092500f41ae9c2c"
@@ -3235,7 +2465,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "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"
 "checksum docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3b5b93718f8b3e5544fcc914c43de828ca6c6ace23e0332c6080a2977b49787a"
-"checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90"
+"checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
 "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"
@@ -3247,7 +2477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
 "checksum fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866"
 "checksum futf 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "51f93f3de6ba1794dcd5810b3546d004600a59a98266487c8407bc4b24e398f3"
-"checksum futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4b63a4792d4f8f686defe3b39b92127fea6344de5d38202b2ee5a11bbbf29d6a"
+"checksum futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a82bdc62350ca9d7974c760e9665102fc9d740992a528c2254aa930e53b783c4"
 "checksum gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)" = "120d07f202dcc3f72859422563522b66fe6463a4c513df062874daad05f85f0a"
 "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"
@@ -3262,75 +2492,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum html5ever 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a49d5001dd1bddf042ea41ed4e0a671d50b1bf187e66b349d7ec613bdce4ad90"
 "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 itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c"
+"checksum itoa 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f74cf6ca1bdbc28496a2b9798ab7fccc2ca5a42cace95bb2b219577216a5fb90"
 "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"
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
-<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe
-"checksum languageserver-types 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d52e477b23bf52cd3ca0f9fc6c5d14be954eec97e3b9cdfbd962d911bd533caf"
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-"checksum languageserver-types 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "680aee78c75504fdcb172635a7b7da0dccaafa4c42d935e19576c14b27942362"
-=======
-<<<<<<< HEAD
-"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
-<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2
->>>>>>> Add warnings when rustdoc html rendering differs
-=======
-=======
-"checksum kuchiki 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "529eda79bcc5e2803758350b2748600a595268fa892a6d1ba1657ee992c6cc18"
-"checksum languageserver-types 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c178b944c3187527293fb9f8a0b0db3c5fb62eb127cacd65296f651a2440f5b1"
->>>>>>> Update unstable check test
->>>>>>> Update unstable check test
-"checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
-<<<<<<< HEAD
-"checksum libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)" = "8a014d9226c2cc402676fbe9ea2e15dd5222cd1dd57f576b5b283178c944a264"
-=======
-<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
-"checksum libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)" = "719aa0af4c241fa71d396ffdfe584aa758f08f35b4680ec3f03ecc2c3fe69b76"
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-"checksum libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)" = "30885bcb161cf67054244d10d4a7f4835ffd58773bc72e07d35fecf472295503"
-=======
-<<<<<<< HEAD
-=======
->>>>>>> Update unstable-crate test
-"checksum libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)" = "38f5c2b18a287cf78b4097db62e20f43cace381dc76ae5c0a3073067f78b7ddc"
->>>>>>> Make html_diff compiles only after stage0
->>>>>>> Make html_diff compiles only after stage0
-<<<<<<< HEAD
->>>>>>> Make html_diff compiles only after stage0
-"checksum libgit2-sys 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "df18a822100352d9863b302faf6f8f25c0e77f0e60feb40e5dbe1238b7f13b1d"
-"checksum libssh2-sys 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0db4ec23611747ef772db1c4d650f8bd762f07b461727ec998f953c614024b75"
-"checksum libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdd64ef8ee652185674455c1d450b83cbc8ad895625d543b5324d923f82e4d8"
-"checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b"
-<<<<<<< HEAD
-"checksum lzma-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "66b2e318eb97ab84f05725471f90c52a09c964053a5899a13fd0165acc26d00b"
-=======
-"checksum lzma-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "013fa6506eb7d26040c46dab9ecb7ccb4e2896b5bf24a9d65932501ea9f67af8"
-<<<<<<< HEAD
->>>>>>> Update unstable-crate test
-"checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376"
-<<<<<<< HEAD
-"checksum mdbook 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "22911d86cde6f80fa9f0fb2a68bbbde85d97af4fe0ce267141c83a4187d28700"
-=======
-=======
->>>>>>> Update html-diff-rs dependency
-=======
-=======
->>>>>>> Update to last master
-=======
->>>>>>> Print warning whatever the rendering mode
 "checksum kuchiki 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ef2ea4f2f7883cd7c6772b06c14abca01a2cc1f75c426cebffcf6b3b925ef9fc"
 "checksum languageserver-types 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d52e477b23bf52cd3ca0f9fc6c5d14be954eec97e3b9cdfbd962d911bd533caf"
 "checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf"
@@ -3350,19 +2515,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "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
-<<<<<<< HEAD
-<<<<<<< HEAD
-"checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09"
-=======
-<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4
-=======
->>>>>>> Update to last master
-"checksum net2 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)" = "94101fd932816f97eb9a5116f6c1a11511a1fed7db21c5ccd823b2dc11abf566"
->>>>>>> Make html_diff compiles only after stage0
-=======
 "checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09"
->>>>>>> Print warning whatever the rendering mode
 "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"
@@ -3372,40 +2525,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "99843c856d68d8b4313b03a17e33c4bb42ae8f6610ea81b28abe076ac721b9b0"
 "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"
-<<<<<<< HEAD
 "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
-<<<<<<< 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"
-<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d
-=======
-"checksum num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6e416ba127a4bb3ff398cb19546a8d0414f73352efe2857f4060d36f5fe5983a"
-"checksum open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3478ed1686bd1300c8a981a940abc92b06fac9cbef747f4c668d4e032ff7b842"
-"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
-<<<<<<< HEAD
->>>>>>> Make html_diff compiles only after stage0
-=======
-=======
->>>>>>> Update unstable-crate test
->>>>>>> Update unstable-crate test
-=======
-"checksum openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "ad95f8160d1c150c4f44d4c4959732e048ac046c37f597fe362f8bf57561ffb4"
->>>>>>> Update to last master
-=======
-"checksum openssl 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)" = "63c619be70f3187485d8257bf36106b83028681c25d10ca052f9789c86b04976"
-"checksum openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d98df0270d404ccd3c050a41d579c52d1db15375168bb3471e04ec0f5f378daf"
-"checksum openssl-sys 0.9.16 (registry+https://github.com/rust-lang/crates.io-index)" = "56d52dd5231a25d3dd9e82e32832cfabe35d9dba6fdc8d0b90622da7dcc73146"
->>>>>>> Print warning whatever the rendering mode
 "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"
@@ -3421,36 +2543,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "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
-<<<<<<< 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 racer 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9079a128fdb6f0c8850010e1478b215d4c00134654bf995bfda41824951ce9bd"
->>>>>>> Update unstable-crate test
-"checksum rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "022e0636ec2519ddae48154b028864bdce4eaf7d35226ab8e65c611be97b189d"
-=======
 "checksum racer 2.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "f120c7510ef7aff254aeb06067fb6fac573ec96a1660e194787cf9dced412bf0"
 "checksum rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "eb250fd207a4729c976794d03db689c9be1d634ab5a1c9da9492a13d8fecbcdf"
->>>>>>> Update to last master
 "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"
@@ -3461,97 +2555,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ffd34691a510938bb67fe0444fb363103c73ffb31c121d1e16bc92d8945ea8ff"
 "checksum rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e"
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 "checksum rustfmt-nightly 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6eea0d0590ae793fc4d281df56e01dc7531575c8ed9a72fadf5fdc7305a0d32f"
-=======
-=======
-<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f
->>>>>>> Update html-diff-rs dependency
-<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2
-"checksum rustfmt-nightly 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa1ffc66e1e1786355f22e8a958a57bd67fbf9564f522f87f31de9586715f8f6"
-=======
-<<<<<<< HEAD
-"checksum rustfmt-nightly 0.1.8 (git+https://github.com/rust-lang-nursery/rustfmt?branch=rustfmt-42492)" = "<none>"
-=======
-"checksum rustfmt-nightly 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ccadd3e5b64b339456f2b8accac5d11423aca8e4fc9140d0fff4bfca4e67e5b3"
->>>>>>> Update unstable check test
->>>>>>> Update unstable check test
->>>>>>> Update unstable check test
-=======
-"checksum rustfmt-nightly 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa1ffc66e1e1786355f22e8a958a57bd67fbf9564f522f87f31de9586715f8f6"
->>>>>>> Update to last master
 "checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7"
 "checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d"
 "checksum scopeguard 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "59a076157c1e2dc561d8de585151ee6965d910dd4dcb5dabb7ae3e83981a6c57"
-<<<<<<< HEAD
-"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"
-<<<<<<< HEAD
-"checksum serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f7726f29ddf9731b17ff113c461e362c381d9d69433f79de4f3dd572488823e9"
-"checksum serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cf823e706be268e73e7747b147aa31c8f633ab4ba31f115efb57e5047c3a76dd"
-=======
-<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2
-"checksum serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "433d7d9f8530d5a939ad5e0e72a6243d2e42a24804f70bf592c679363dcacb2f"
-"checksum serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "7b707cf0d4cab852084f573058def08879bb467fda89d99052485e7d00edd624"
-=======
-<<<<<<< HEAD
-=======
-"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
->>>>>>> Update unstable check test
-"checksum serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6a7c6b751a2e8d5df57a5ff71b5b4fc8aaee9ee28ff1341d640dd130bb5f4f7a"
-"checksum serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "2f6ca58905ebd3c3b285a8a6d4f3ac92b92c0d7951d5649b1bdd212549c06639"
->>>>>>> Update unstable check test
-<<<<<<< HEAD
->>>>>>> Update unstable check test
-=======
-=======
-"checksum rustfmt-nightly 0.1.8 (git+https://github.com/rust-lang-nursery/rustfmt?branch=rustfmt-42492)" = "<none>"
-"checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7"
-"checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d"
-"checksum selectors 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3c89b1c6a3c029c82263f7dd2d44d0005ee7374eb09e254ab59dede4353a8c0"
-"checksum semver 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdd61b85a0fa777f7fb7c454b9189b2941b110d1385ce84d7f76efdf1606a85"
-"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "433d7d9f8530d5a939ad5e0e72a6243d2e42a24804f70bf592c679363dcacb2f"
-"checksum serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "7b707cf0d4cab852084f573058def08879bb467fda89d99052485e7d00edd624"
->>>>>>> Update html-diff-rs dependency
->>>>>>> Update html-diff-rs dependency
-=======
 "checksum selectors 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3c89b1c6a3c029c82263f7dd2d44d0005ee7374eb09e254ab59dede4353a8c0"
 "checksum semver 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdd61b85a0fa777f7fb7c454b9189b2941b110d1385ce84d7f76efdf1606a85"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum serde 1.0.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"
->>>>>>> Update to last master
 "checksum serde_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37aee4e0da52d801acfbc0cc219eb1eda7142112339726e427926a6f6ee65d3a"
 "checksum serde_ignored 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c10e798e4405d7dcec3658989e35ee6706f730a9ed7c1184d5ebd84317e82f46"
 "checksum serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "48b04779552e92037212c3615370f6bd57a40ebba7f20e554ff9f55e41a69a7b"
 "checksum shell-escape 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "dd5cc96481d54583947bfe88bf30c23d53f883c6cd0145368b69989d97b84ef8"
-<<<<<<< HEAD
-<<<<<<< HEAD
-"checksum socket2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4daf80fcf54186fac4fe049e0b39d36a5cfde69a11a06413e61e77f553cccf9a"
-=======
-<<<<<<< HEAD
-"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 siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537"
 "checksum smallvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4f8266519bc1d17d0b5b16f6c21295625d562841c708f6376f49028a43e9c11e"
-<<<<<<< HEAD
-"checksum socket2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "12cdbddbaa27bf94cc194b8e37f5811db6fe83cea96cf99cf1f8e92b65a41371"
->>>>>>> Update unstable-crate test
-=======
 "checksum socket2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4daf80fcf54186fac4fe049e0b39d36a5cfde69a11a06413e61e77f553cccf9a"
->>>>>>> Print warning whatever the rendering mode
 "checksum stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "15132e0e364248108c5e2c02e3ab539be8d6f5d52a01ca9bbf27ed657316f02b"
 "checksum string_cache 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "413fc7852aeeb5472f1986ef755f561ddf0c789d3d796e65f0b6fe293ecd4ef8"
 "checksum string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "479cde50c3539481f33906a387f2bd17c8e87cb848c35b6021d41fb81ff9b4d7"
@@ -3570,100 +2589,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
 "checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209"
 "checksum termcolor 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5193a56b8d82014662c4b933dea6bec851daf018a2b01722e007daaf5f9dca"
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 "checksum textwrap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f728584ea33b0ad19318e20557cb0a39097751dbb07171419673502f848c7af6"
-=======
-<<<<<<< HEAD
-"checksum textwrap 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f86300c3e7416ee233abd7cda890c492007a3980f941f79185c753a701257167"
-=======
-=======
-=======
->>>>>>> Update unstable-crate test
-"checksum tendril 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4ce04c250d202db8004921e3d3bc95eaa4f2126c6937a428ae39d12d0e38df62"
-"checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
-"checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209"
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> Add warnings when rustdoc html rendering differs
-<<<<<<< HEAD
->>>>>>> Add warnings when rustdoc html rendering differs
-<<<<<<< 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
-<<<<<<< HEAD
->>>>>>> Make html_diff compiles only after stage0
-=======
-=======
-"checksum termcolor 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5193a56b8d82014662c4b933dea6bec851daf018a2b01722e007daaf5f9dca"
->>>>>>> Update unstable-crate test
->>>>>>> Update unstable-crate test
-=======
-"checksum textwrap 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f86300c3e7416ee233abd7cda890c492007a3980f941f79185c753a701257167"
->>>>>>> Update html-diff-rs dependency
-=======
-"checksum textwrap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f728584ea33b0ad19318e20557cb0a39097751dbb07171419673502f848c7af6"
->>>>>>> Update to last master
 "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
 "checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
 "checksum thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14"
 "checksum toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4"
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-"checksum toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7540f4ffc193e0d3c94121edb19b055670d369f77d5804db11ae053a45b6e7e"
-"checksum typed-arena 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5934776c3ac1bea4a9d56620d6bf2d483b20d394e49581db40f187e1118ff667"
-"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-"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
-<<<<<<< HEAD
->>>>>>> Add warnings when rustdoc html rendering differs
-=======
->>>>>>> Update unstable-crate test
-=======
->>>>>>> Update html-diff-rs dependency
-"checksum toml 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b0601da6c97135c8d330c7a13a013ca6cd4143221b01de2f8d4edc50a9e551c7"
-"checksum typed-arena 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5934776c3ac1bea4a9d56620d6bf2d483b20d394e49581db40f187e1118ff667"
-"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-"checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f"
-"checksum unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18127285758f0e2c6cf325bb3f3d138a12fee27de4f23e146cd6a179f26c2cf3"
-<<<<<<< HEAD
-=======
-=======
-"checksum toml 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4cc5dbfb20a481e64b99eb7ae280859ec76730c7191570ba5edaa962394edb0a"
-"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
-=======
->>>>>>> Update unstable-crate test
-"checksum unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8083c594e02b8ae1654ae26f0ade5158b119bd88ad0e8227a5d8fcd72407946"
->>>>>>> Add warnings when rustdoc html rendering differs
->>>>>>> Add warnings when rustdoc html rendering differs
-=======
->>>>>>> Update html-diff-rs dependency
-=======
-"checksum toml 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3e5e16033aacf7eead46cbcb62d06cf9d1c2aa1b12faa4039072f7ae5921103b"
-=======
 "checksum toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7540f4ffc193e0d3c94121edb19b055670d369f77d5804db11ae053a45b6e7e"
->>>>>>> Print warning whatever the rendering mode
 "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"
->>>>>>> Update to last master
 "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"
diff --git a/src/bootstrap/bin/sccache-plus-cl.rs b/src/bootstrap/bin/sccache-plus-cl.rs
index 5684a565a9c..cf0c1274923 100644
--- a/src/bootstrap/bin/sccache-plus-cl.rs
+++ b/src/bootstrap/bin/sccache-plus-cl.rs
@@ -18,7 +18,7 @@ fn main() {
     // Locate the actual compiler that we're invoking
     env::remove_var("CC");
     env::remove_var("CXX");
-    let mut cfg = gcc::Build::new();
+    let mut cfg = gcc::Config::new();
     cfg.cargo_metadata(false)
        .out_dir("/")
        .target(&target)
diff --git a/src/libprofiler_builtins/build.rs b/src/libprofiler_builtins/build.rs
index 41e92b33475..55df14ea215 100644
--- a/src/libprofiler_builtins/build.rs
+++ b/src/libprofiler_builtins/build.rs
@@ -19,7 +19,7 @@ use std::path::Path;
 
 fn main() {
     let target = env::var("TARGET").expect("TARGET was not set");
-    let cfg = &mut gcc::Build::new();
+    let cfg = &mut gcc::Config::new();
 
     let mut profile_sources = vec!["GCDAProfiling.c",
                                    "InstrProfiling.c",
diff --git a/src/librustdoc/build.rs b/src/librustdoc/build.rs
index 130c6fd01a8..4189e3d2ac7 100644
--- a/src/librustdoc/build.rs
+++ b/src/librustdoc/build.rs
@@ -14,7 +14,7 @@ extern crate gcc;
 fn main() {
     let src_dir = std::path::Path::new("../rt/hoedown/src");
     build_helper::rerun_if_changed_anything_in_dir(src_dir);
-    let mut cfg = gcc::Build::new();
+    let mut cfg = gcc::Config::new();
     cfg.file("../rt/hoedown/src/autolink.c")
        .file("../rt/hoedown/src/buffer.c")
        .file("../rt/hoedown/src/document.c")
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 900fcad7794..c45b0ed49d5 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -1659,7 +1659,15 @@ fn get_html_diff(w: &mut fmt::Formatter, md_text: &str, render_type: RenderType,
         println!("Differences spotted in {:?}:\n{}",
                  md_text,
                  differences.iter()
-                            .map(|s| format!("=> {}", s.to_string()))
+                            .filter_map(|s| {
+                                match *s {
+                                    html_diff::Difference::NodeText { ref elem_text,
+                                                                      ref opposite_elem_text,
+                                                                      .. }
+                                        if elem_text.trim() == opposite_elem_text.trim() => None,
+                                    _ => Some(format!("=> {}", s.to_string())),
+                                }
+                            })
                             .collect::<Vec<String>>()
                             .join("\n"));
     }
author	Guillaume Gomez <guillaume1.gomez@gmail.com>	2017-08-27 12:40:56 +0200
committer	Guillaume Gomez <guillaume1.gomez@gmail.com>	2017-08-30 11:46:58 +0200
commit	9b26f3ad25bc9603ace18931eada23438f3b64d7 (patch)
tree	20082beba3e1d4bcd2ce53b2f922a4110d440aca
parent	bba7fd9dd54937719a6e88c954db7ab2ea5a3541 (diff)
download	rust-9b26f3ad25bc9603ace18931eada23438f3b64d7.tar.gz rust-9b26f3ad25bc9603ace18931eada23438f3b64d7.zip