From 274543b9cae2918a7d01733569d31a3a7e258bcb Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 14 May 2017 15:14:02 +0200 Subject: [PATCH 1/8] Add warnings when rustdoc html rendering differs --- src/Cargo.lock | 1726 +++++++++++++++++++++++++++++++ src/librustdoc/Cargo.toml | 3 + src/librustdoc/html/render.rs | 35 +- src/librustdoc/lib.rs | 2 + src/test/rustdoc/issue-12834.rs | 2 +- 5 files changed, 1765 insertions(+), 3 deletions(-) diff --git a/src/Cargo.lock b/src/Cargo.lock index ad96ff40cd6..e0e603e616f 100644 --- 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,9 +1100,52 @@ 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" @@ -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,9 +1453,30 @@ 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" version = "0.1.6" @@ -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)" = "" +======= +<<<<<<< HEAD +<<<<<<< HEAD +"checksum cargo 0.21.0 (git+https://github.com/rust-lang/cargo)" = "" +>>>>>>> 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)" = "" +"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)" = "" +"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)" = "" +"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 f9400e68a16..c6a7cec52ff 100644 --- 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 5457f69cb6d..27c67e2a4bc 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -75,6 +75,9 @@ use html::item_type::ItemType; 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); @@ -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::>() + .join("\n")); + } + write!(w, "
{}{}
", prefix, output) + } else { + write!(w, "
{}{}
", + 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, "
{}
", 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, "
{}{}
", prefix, Markdown(&markdown, render_type))?; + get_html_diff(&markdown, render_type, prefix)?; } else if !prefix.is_empty() { write!(w, "
{}
", 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, "
{}{}
", 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, "
{}
", prefix)?; } diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 61a8165d26a..d45513489ab 100644 --- 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 30dce27e738..48d63d9566a 100644 --- a/src/test/rustdoc/issue-12834.rs +++ b/src/test/rustdoc/issue-12834.rs @@ -15,7 +15,7 @@ // @has issue_12834/fn.foo.html // @has - //pre 'a + b ' -/// ``` +/// ```text /// a + b ∈ Self ∀ a, b ∈ Self /// ``` pub fn foo() {} From e1367ef1b15a5736210c86bef91deee7ae674cec Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 14 Jun 2017 13:35:45 +0200 Subject: [PATCH 2/8] Update unstable-crate test --- src/Cargo.lock | 1524 +++++++++++------ src/librustdoc/Cargo.toml | 4 +- src/librustdoc/html/render.rs | 15 +- src/librustdoc/lib.rs | 2 +- .../sysroot-crates-are-unstable/Makefile | 37 +- .../sysroot-crates-are-unstable/test.py | 71 + src/test/rustdoc/issue-12834.rs | 2 +- 7 files changed, 1118 insertions(+), 537 deletions(-) create mode 100644 src/test/run-make/sysroot-crates-are-unstable/test.py diff --git a/src/Cargo.lock b/src/Cargo.lock index e0e603e616f..1640ab10578 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -80,13 +80,18 @@ 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 <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -110,8 +115,23 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -124,15 +144,20 @@ 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 <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD "rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ======= ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -142,8 +167,23 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency "rustc-demangle 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -155,12 +195,17 @@ 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 <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -170,8 +215,23 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency ] [[package]] @@ -206,6 +266,7 @@ dependencies = [ "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", @@ -219,16 +280,11 @@ dependencies = [ "toml 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ======= <<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= <<<<<<< HEAD - "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 - "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ======= - "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 +>>>>>>> Update html-diff-rs dependency + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 @@ -262,22 +318,42 @@ dependencies = [ [[package]] name = "cargo" +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe version = "0.22.0" source = "git+https://github.com/rust-lang/cargo#bcf3997b1fa177afc5b6c632a6fbbf6cc75df427" replace = "cargo 0.22.0" ======= <<<<<<< HEAD +======= +>>>>>>> Update unstable-crate test version = "0.21.0" +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +<<<<<<< HEAD +<<<<<<< HEAD source = "git+https://github.com/rust-lang/cargo#1566c92b5d28e435613918e59dc94755f99d73b1" replace = "cargo 0.21.0" ======= -version = "0.20.0" <<<<<<< HEAD +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d source = "git+https://github.com/rust-lang/cargo#ac04d2e0afa95cb749406f4934421342506da4f2" replace = "cargo 0.20.0" >>>>>>> Add warnings when rustdoc html rendering differs >>>>>>> Add warnings when rustdoc html rendering differs +======= +source = "git+https://github.com/rust-lang/cargo#eb6cf012a6cc23c9c89c4009564de9fccc38b9cb" +>>>>>>> Update unstable-crate test +======= +source = "git+https://github.com/rust-lang/cargo#854bc167bbf74053f821f65cb86d506033f3d3a7" +>>>>>>> Update unstable-crate test +======= +source = "git+https://github.com/rust-lang/cargo#cc8aa6f03274a91c3f3d86835ab36eb7de5099f0" +>>>>>>> Update unstable check test +======= +source = "git+https://github.com/rust-lang/cargo#74e54214c9d13871934fde0ecb07250e523c4e92" +>>>>>>> Update html-diff-rs dependency +replace = "cargo 0.21.0" +>>>>>>> Update unstable-crate test [[package]] name = "cargo" @@ -285,9 +361,12 @@ name = "cargo" version = "0.22.0" ======= version = "0.21.0" +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d ======= >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +======= +>>>>>>> Update unstable-crate test dependencies = [ "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -296,17 +375,16 @@ dependencies = [ "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "crates-io 0.11.0", "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "curl 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ======= <<<<<<< HEAD +======= +>>>>>>> Update unstable-crate test "curl 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 "docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "docopt 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.11.0-rc.2 (registry+https://github.com/rust-lang/crates.io-index)", "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -316,7 +394,6 @@ dependencies = [ "git2-curl 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "hamcrest 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD "hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "home 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "ignore 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -334,6 +411,7 @@ dependencies = [ "openssl 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", ======= "openssl 0.9.14 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d ======= "jobserver 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -345,7 +423,12 @@ dependencies = [ "openssl 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test "psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -357,58 +440,9 @@ dependencies = [ "shell-escape 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "tar 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD "termcolor 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "term 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "cargo" -version = "0.21.0" -source = "git+https://github.com/rust-lang/cargo#d917378d335219be490aad3f22c196d99c638f28" -dependencies = [ - "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "crates-io 0.10.0 (git+https://github.com/rust-lang/cargo)", - "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "docopt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", - "fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "git2 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "git2-curl 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jobserver 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", - "libgit2-sys 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)", - "psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "semver 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_ignored 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "shell-escape 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tar 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "termcolor 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -429,40 +463,49 @@ dependencies = [ "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 <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 "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 <<<<<<< 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 +======= +>>>>>>> Update unstable-crate test "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "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 +<<<<<<< HEAD "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2 >>>>>>> Make html_diff compiles only after stage0 +======= +======= + "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable check test +>>>>>>> Update unstable check test +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "tar 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "term 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 ] @@ -524,18 +567,26 @@ dependencies = [ "diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d +>>>>>>> Update unstable-crate test <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= ======= >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -577,24 +628,7 @@ dependencies = [ "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "crates-io" -version = "0.10.0" -source = "git+https://github.com/rust-lang/cargo#d917378d335219be490aad3f22c196d99c638f28" -dependencies = [ - "curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 ] [[package]] @@ -604,13 +638,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cssparser" -version = "0.7.4" +version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", + "procedural-masquerade 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cssparser-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", + "procedural-masquerade 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -618,14 +665,18 @@ name = "curl" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ -<<<<<<< HEAD "curl-sys 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -633,10 +684,21 @@ dependencies = [ <<<<<<< HEAD "curl-sys 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 +======= + "curl-sys 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +======= +>>>>>>> Update unstable check test "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency "openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD "openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -644,6 +706,7 @@ dependencies = [ ======= "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", "socket2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD ======= "curl-sys 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", @@ -651,17 +714,14 @@ dependencies = [ "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +======= +>>>>>>> Update unstable-crate test "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "curl-sys" -<<<<<<< HEAD version = "0.3.14" -======= -<<<<<<< HEAD -version = "0.3.13" ->>>>>>> Make html_diff compiles only after stage0 source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", @@ -670,17 +730,6 @@ dependencies = [ "openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -======= -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", - "libz-sys 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "vcpkg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -722,14 +771,20 @@ 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 "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -753,8 +808,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +======= +>>>>>>> Update unstable-crate test "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", +======= + "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable check test +======= + "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency "strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -763,63 +828,6 @@ 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" @@ -874,12 +882,17 @@ name = "filetime" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -897,8 +910,23 @@ dependencies = [ "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency ] [[package]] @@ -918,12 +946,17 @@ name = "flate2" version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -933,8 +966,23 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency "miniz-sys 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -958,12 +1006,17 @@ 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 <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -973,8 +1026,23 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1009,31 +1077,37 @@ 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 <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= <<<<<<< HEAD +======= +>>>>>>> Update unstable-crate test "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency "libgit2-sys 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", - "libgit2-sys 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-probe 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 ] [[package]] @@ -1044,11 +1118,7 @@ dependencies = [ "curl 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "git2 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 ] [[package]] @@ -1100,53 +1170,30 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -<<<<<<< HEAD -name = "hex" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -======= -======= name = "hex" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] ->>>>>>> Make html_diff compiles only after stage0 name = "html-diff" -version = "0.0.2" +version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "html5ever-atoms 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "kuchiki 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "kuchiki 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "html5ever" -version = "0.13.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "html5ever-atoms 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", + "markup5ever 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", - "tendril 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "html5ever-atoms" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "string_cache 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_codegen 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] ->>>>>>> Add warnings when rustdoc html rendering differs - [[package]] name = "highlight" version = "0.1.0" @@ -1172,20 +1219,9 @@ name = "idna" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ -<<<<<<< HEAD -<<<<<<< HEAD "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-bidi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 - "unicode-normalization 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Add warnings when rustdoc html rendering differs ] [[package]] @@ -1240,12 +1276,17 @@ name = "jobserver" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1255,8 +1296,23 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1283,15 +1339,13 @@ dependencies = [ [[package]] name = "kuchiki" -version = "0.4.3" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cssparser 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", - "html5ever 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", - "html5ever-atoms 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)", + "html5ever 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "ref_slice 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "selectors 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)", + "selectors 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1303,11 +1357,7 @@ dependencies = [ "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1326,12 +1376,17 @@ dependencies = [ [[package]] name = "libc" <<<<<<< HEAD +<<<<<<< HEAD version = "0.2.29" ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 version = "0.2.27" ======= <<<<<<< HEAD +<<<<<<< HEAD version = "0.2.26" ======= <<<<<<< HEAD @@ -1340,8 +1395,23 @@ version = "0.2.24" version = "0.2.23" >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= +version = "0.2.24" +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= +version = "0.2.26" +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1350,12 +1420,7 @@ version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cmake 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD "curl-sys 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "curl-sys 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "libssh2-sys 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1367,6 +1432,7 @@ dependencies = [ "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", ======= "openssl-sys 0.9.14 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d ======= "curl-sys 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1376,7 +1442,12 @@ dependencies = [ "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1386,9 +1457,13 @@ 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 <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 @@ -1399,26 +1474,30 @@ dependencies = [ "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", ======= <<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= <<<<<<< HEAD - "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 +======= +>>>>>>> Update html-diff-rs dependency + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.14 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d ======= "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libz-sys" -<<<<<<< HEAD version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -1426,15 +1505,6 @@ dependencies = [ "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -======= -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "vcpkg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 ] [[package]] @@ -1453,12 +1523,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1468,8 +1543,23 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency ] [[package]] @@ -1477,6 +1567,19 @@ name = "mac" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "markup5ever" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tendril 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "matches" version = "0.1.6" @@ -1487,31 +1590,24 @@ name = "mdbook" version = "0.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe "clap 2.25.1 (registry+https://github.com/rust-lang/crates.io-index)", ======= <<<<<<< HEAD +======= +>>>>>>> Update html-diff-rs dependency "clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Add warnings when rustdoc html rendering differs >>>>>>> Add warnings when rustdoc html rendering differs "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "handlebars 0.26.2 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "clap 2.24.2 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD -<<<<<<< HEAD - "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Add warnings when rustdoc html rendering differs -======= - "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 - "handlebars 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Add warnings when rustdoc html rendering differs "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "pulldown-cmark 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1526,12 +1622,17 @@ name = "memchr" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1541,8 +1642,23 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency ] [[package]] @@ -1550,12 +1666,17 @@ name = "memchr" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1565,8 +1686,23 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency ] [[package]] @@ -1575,12 +1711,17 @@ 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 <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1590,8 +1731,23 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency ] [[package]] @@ -1616,12 +1772,17 @@ 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 <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1631,8 +1792,23 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1705,13 +1881,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "num_cpus" -<<<<<<< HEAD version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1719,6 +1898,7 @@ dependencies = [ "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD ======= version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1726,8 +1906,22 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency ] [[package]] @@ -1742,8 +1936,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "openssl" <<<<<<< HEAD +<<<<<<< HEAD version = "0.9.17" ======= +======= +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d +>>>>>>> Update unstable-crate test <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 version = "0.9.15" ======= @@ -1753,36 +1951,62 @@ version = "0.9.14" version = "0.9.13" >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +version = "0.9.14" +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD "openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)", ======= ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= <<<<<<< HEAD +======= +>>>>>>> Update unstable-crate test "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 "openssl-sys 0.9.14 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d ======= "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.14 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency ] [[package]] @@ -1793,8 +2017,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "openssl-sys" <<<<<<< HEAD +<<<<<<< HEAD version = "0.9.17" ======= +======= +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d +>>>>>>> Update unstable-crate test <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 version = "0.9.15" >>>>>>> Make html_diff compiles only after stage0 @@ -1807,14 +2035,17 @@ dependencies = [ "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= <<<<<<< HEAD +======= +>>>>>>> Update unstable-crate test version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ======= "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD ======= version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1824,8 +2055,18 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +======= +>>>>>>> Update html-diff-rs dependency "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1905,6 +2146,11 @@ name = "pkg-config" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "precomputed-hash" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "proc_macro" version = "0.0.0" @@ -1913,6 +2159,11 @@ dependencies = [ "syntax_pos 0.0.0", ] +[[package]] +name = "procedural-masquerade" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "profiler_builtins" version = "0.0.0" @@ -1958,6 +2209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "racer" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "2.0.10" ======= ======= @@ -1974,17 +2226,24 @@ version = "2.0.7" version = "2.0.8" >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +======= +version = "2.0.9" +>>>>>>> Update unstable-crate test source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ======= >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +======= + "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "syntex_errors 0.52.0 (registry+https://github.com/rust-lang/crates.io-index)", "syntex_syntax 0.52.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2004,9 +2263,13 @@ name = "rand" version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 @@ -2025,18 +2288,21 @@ version = "0.1.0" ======= ======= <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Update html-diff-rs dependency "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ======= >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 <<<<<<< HEAD - "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", ======= - "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 +>>>>>>> Update unstable-crate test + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2050,6 +2316,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" >>>>>>> Add warnings when rustdoc html rendering differs ======= >>>>>>> Make html_diff compiles only after stage0 +======= +>>>>>>> Update html-diff-rs dependency name = "regex" version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2101,6 +2369,7 @@ 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 "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)", @@ -2108,6 +2377,9 @@ dependencies = [ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "racer 2.0.10 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe "jsonrpc-core 7.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "languageserver-types 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2123,30 +2395,19 @@ dependencies = [ "rls-data 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ======= <<<<<<< HEAD - "languageserver-types 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", -======= <<<<<<< HEAD - "languageserver-types 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Add warnings when rustdoc html rendering differs +======= +>>>>>>> Update html-diff-rs dependency + "languageserver-types 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "racer 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "rls-analysis 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rls-data 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2 ======= "languageserver-types 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD -<<<<<<< HEAD "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "racer 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD - "racer 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Add warnings when rustdoc html rendering differs -======= - "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "racer 2.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 "rls-analysis 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rls-data 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD @@ -2166,8 +2427,9 @@ dependencies = [ >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +======= +>>>>>>> Update unstable check test "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD "rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD "rustfmt-nightly 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2180,29 +2442,42 @@ dependencies = [ "serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", ======= "rustfmt-nightly 0.1.8 (git+https://github.com/rust-lang-nursery/rustfmt?branch=rustfmt-42492)", +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ======= <<<<<<< HEAD +======= +>>>>>>> Update unstable-crate test "rls-vfs 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD "rustfmt-nightly 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "rustfmt-nightly 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable check test +>>>>>>> Update unstable check test +<<<<<<< HEAD +>>>>>>> Update unstable check test +======= +======= + "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "rls-vfs 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt 0.9.0 (git+https://github.com/rust-lang-nursery/rustfmt?branch=libsyntax)", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2245,6 +2520,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "racer 2.0.10 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -2262,6 +2538,9 @@ dependencies = [ "racer 2.0.8 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +======= + "racer 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2281,6 +2560,7 @@ dependencies = [ "flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "fmt_macros 0.0.0", "graphviz 0.0.0", +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "jobserver 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -2289,6 +2569,9 @@ dependencies = [ ======= >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +======= + "jobserver 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_back 0.0.0", @@ -2498,11 +2781,7 @@ dependencies = [ name = "rustc_metadata" version = "0.0.0" dependencies = [ -<<<<<<< HEAD "flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "flate 0.0.0", ->>>>>>> Make html_diff compiles only after stage0 "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "proc_macro 0.0.0", @@ -2599,9 +2878,13 @@ name = "rustc_save_analysis" version = "0.0.0" dependencies = [ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD <<<<<<< HEAD "rls-data 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d +>>>>>>> Update unstable-crate test <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "rls-data 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -2611,7 +2894,13 @@ dependencies = [ "rls-data 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= + "rls-data 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc 0.0.0", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2626,8 +2915,11 @@ name = "rustc_trans" version = "0.0.0" dependencies = [ <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD +======= +>>>>>>> Update unstable-crate test "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 "flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2636,11 +2928,14 @@ dependencies = [ "jobserver 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ======= "jobserver 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d ======= "flate 0.0.0", "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +======= +>>>>>>> Update unstable-crate test "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2702,27 +2997,10 @@ name = "rustdoc" version = "0.0.0" dependencies = [ "build_helper 0.1.0", -<<<<<<< HEAD -<<<<<<< HEAD "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", + "html-diff 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "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)", ] @@ -2734,22 +3012,30 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD name = "rustfmt-nightly" <<<<<<< HEAD +<<<<<<< HEAD version = "0.2.2" ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe version = "0.2.1" >>>>>>> Add warnings when rustdoc html rendering differs source = "registry+https://github.com/rust-lang/crates.io-index" ======= <<<<<<< HEAD +<<<<<<< HEAD version = "0.1.8" source = "git+https://github.com/rust-lang-nursery/rustfmt?branch=rustfmt-42492#7333dfc95b4af5c7283ba03f33c50f108d2be3f5" ======= version = "0.1.7" +======= +version = "0.1.8" +>>>>>>> Update unstable check test source = "registry+https://github.com/rust-lang/crates.io-index" +<<<<<<< HEAD ======= name = "rustfmt" version = "0.9.0" @@ -2769,18 +3055,32 @@ source = "git+https://github.com/rust-lang-nursery/rustfmt#c0fae6a82a4cea3320f6e ======= >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +======= +======= +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +======= +version = "0.1.8" +source = "git+https://github.com/rust-lang-nursery/rustfmt?branch=rustfmt-42492#7333dfc95b4af5c7283ba03f33c50f108d2be3f5" +>>>>>>> Update html-diff-rs dependency dependencies = [ "diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -2790,24 +3090,37 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "strings 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD -<<<<<<< HEAD "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ======= "toml 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD "unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD ======= ======= <<<<<<< HEAD @@ -2820,9 +3133,13 @@ dependencies = [ "term 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Add warnings when rustdoc html rendering differs +======= +>>>>>>> Update unstable-crate test "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Add warnings when rustdoc html rendering differs >>>>>>> Add warnings when rustdoc html rendering differs +======= +>>>>>>> Update html-diff-rs dependency "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2842,13 +3159,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "selectors" -version = "0.15.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cssparser 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", + "precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2872,7 +3193,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" +<<<<<<< HEAD +<<<<<<< HEAD version = "1.0.11" +======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency +<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2 +version = "1.0.10" +======= +<<<<<<< HEAD +======= +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "serde" +>>>>>>> Update unstable check test +version = "1.0.9" +>>>>>>> Update unstable check test +<<<<<<< HEAD +>>>>>>> Update unstable check test +======= +======= +version = "1.0.10" +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2899,7 +3246,39 @@ name = "serde_ignored" version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ +<<<<<<< HEAD +<<<<<<< HEAD "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", +======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency +<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2 + "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", +======= + "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD +======= +] + +[[package]] +name = "serde_json" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable check test +>>>>>>> Update unstable check test +<<<<<<< HEAD +>>>>>>> Update unstable check test +======= +======= + "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency ] [[package]] @@ -2909,8 +3288,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", +======= +======= + "num-traits 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency + "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency ] [[package]] @@ -2923,7 +3310,16 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -<<<<<<< HEAD +name = "siphasher" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "smallvec" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "socket2" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2934,11 +3330,6 @@ dependencies = [ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -======= -name = "siphasher" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" ->>>>>>> Add warnings when rustdoc html rendering differs [[package]] name = "stable_deref_trait" @@ -2979,29 +3370,26 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.4.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ -<<<<<<< HEAD - "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -======= "debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_codegen 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_codegen" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3019,7 +3407,6 @@ dependencies = [ ] [[package]] ->>>>>>> Add warnings when rustdoc html rendering differs name = "strsim" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3033,15 +3420,6 @@ 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" @@ -3097,12 +3475,17 @@ name = "syntex_errors" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -3112,8 +3495,23 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", "syntex_pos 0.52.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3135,12 +3533,17 @@ 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 <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -3150,8 +3553,23 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", "syntex_errors 0.52.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3166,12 +3584,17 @@ 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 <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -3181,8 +3604,23 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency "xattr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3196,13 +3634,12 @@ dependencies = [ [[package]] name = "tendril" -version = "0.2.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "futf 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "utf-8 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "utf-8 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3224,12 +3661,17 @@ 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 <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -3239,8 +3681,23 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3249,11 +3706,7 @@ name = "termcolor" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ -<<<<<<< HEAD "wincolor 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "wincolor 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 ] [[package]] @@ -3279,15 +3732,23 @@ 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 <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +>>>>>>> Update unstable-crate test <<<<<<< HEAD "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -3305,16 +3766,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD - "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +>>>>>>> Update unstable-crate test +======= +>>>>>>> Update unstable check test + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency ] [[package]] ->>>>>>> Make html_diff compiles only after stage0 name = "thread_local" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3358,24 +3833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "unicode-bidi" -<<<<<<< HEAD -<<<<<<< HEAD version = "0.3.4" -======= -======= ->>>>>>> Make html_diff compiles only after stage0 -<<<<<<< HEAD -version = "0.3.3" -======= -version = "0.2.6" ->>>>>>> Add warnings when rustdoc html rendering differs -<<<<<<< HEAD ->>>>>>> Add warnings when rustdoc html rendering differs -======= -======= -version = "0.3.3" ->>>>>>> Make html_diff compiles only after stage0 ->>>>>>> Make html_diff compiles only after stage0 source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3383,11 +3841,7 @@ dependencies = [ [[package]] name = "unicode-normalization" -<<<<<<< HEAD version = "0.1.5" -======= -version = "0.1.4" ->>>>>>> Add warnings when rustdoc html rendering differs source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -3410,6 +3864,14 @@ name = "unicode-xid" version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "unreachable" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "unreachable" version = "1.0.0" @@ -3419,20 +3881,10 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD name = "unstable-book-gen" version = "0.1.0" dependencies = [ "tidy 0.1.0", -======= -name = "url" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "idna 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 ] [[package]] @@ -3440,18 +3892,17 @@ name = "url" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ======= <<<<<<< HEAD +======= +>>>>>>> Update unstable-crate test "idna 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 ] [[package]] @@ -3473,7 +3924,7 @@ dependencies = [ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ======= name = "utf-8" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 @@ -3496,11 +3947,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "vcpkg" -<<<<<<< HEAD version = "0.2.2" -======= -version = "0.2.0" ->>>>>>> Make html_diff compiles only after stage0 source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -3535,11 +3982,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "wincolor" -<<<<<<< HEAD version = "0.1.4" -======= -version = "0.1.3" ->>>>>>> Make html_diff compiles only after stage0 source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3560,12 +4003,17 @@ name = "xattr" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ======= +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -3575,8 +4023,23 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +======= + "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +<<<<<<< HEAD +>>>>>>> Update unstable-crate test +======= +======= + "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency ] [[package]] @@ -3599,6 +4062,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6" "checksum ar 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b24e4eef8e3fa7e2ca75b157e6039cdf8d9d3a68213ddc19d0fd9d576b9717c9" "checksum atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159" +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD "checksum backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "72f9b4182546f4b04ebc4ab7f84948953a118bd6021a1b6a6c909e3e94f6be76" @@ -3613,32 +4078,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum backtrace-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d192fd129132fbc97497c1f2ec2c2c5174e376b95f535199ef4fe0a293d33842" >>>>>>> Add warnings when rustdoc html rendering differs ======= +======= +>>>>>>> Update unstable-crate test "checksum backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "72f9b4182546f4b04ebc4ab7f84948953a118bd6021a1b6a6c909e3e94f6be76" "checksum backtrace-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3a0d842ea781ce92be2bf78a9b38883948542749640b8378b3b2f03d1fd9f1ff" ->>>>>>> Make html_diff compiles only after stage0 "checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23" >>>>>>> Add warnings when rustdoc html rendering differs >>>>>>> Add warnings when rustdoc html rendering differs +======= +"checksum backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "72f9b4182546f4b04ebc4ab7f84948953a118bd6021a1b6a6c909e3e94f6be76" +"checksum backtrace-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3a0d842ea781ce92be2bf78a9b38883948542749640b8378b3b2f03d1fd9f1ff" +>>>>>>> Update html-diff-rs dependency "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" "checksum bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4" "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" "checksum bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f382711e76b9de6c744cc00d0497baba02fb00a787f088c879f01d09468e32" +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe "checksum cargo 0.22.0 (git+https://github.com/rust-lang/cargo)" = "" ======= <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> Update unstable-crate test "checksum cargo 0.21.0 (git+https://github.com/rust-lang/cargo)" = "" >>>>>>> Add warnings when rustdoc html rendering differs "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de" +<<<<<<< HEAD +<<<<<<< HEAD "checksum clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2267a8fdd4dce6956ba6649e130f62fb279026e5e84b92aa939ac8f85ce3f9f0" +======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency +<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2 +"checksum clap 2.25.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7f1aabf260a8f3fefa8871f16b531038c98dd9eab1cfa2c575e78c459abfa3a0" +>>>>>>> Update unstable check test "checksum cmake 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ebbb35d3dc9cd09497168f33de1acb79b265d350ab0ac34133b98f8509af1f" "checksum core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5909502e547762013619f4c4e01cc7393c20fe2d52d7fa471c1210adb2320dc7" "checksum core-foundation-sys 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bc9fb3d6cb663e6fd7cf1c63f9b144ee2b1e4a78595a0451dd34bff85b9a3387" "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97" +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe "checksum curl 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7034c534a1d7d22f7971d6088aa9d281d219ef724026c3428092500f41ae9c2c" ======= +======= +<<<<<<< HEAD +>>>>>>> Update unstable-crate test "checksum curl 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6689276ab61f97c660669a5ecc117c36875dfc1ba301c986b16c653415bdf9d7" <<<<<<< HEAD >>>>>>> Add warnings when rustdoc html rendering differs @@ -3648,48 +4134,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ======= "checksum cargo 0.20.0 (git+https://github.com/rust-lang/cargo)" = "" "checksum cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c" +======= +>>>>>>> Update unstable check test <<<<<<< 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)" = "" -"checksum cfg-if 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c47d456a36ebf0536a6705c83c1cbbcb9255fbc1d905a6ded104f479268a29" ->>>>>>> Make html_diff compiles only after stage0 -"checksum clap 2.24.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6b8f69e518f967224e628896b54e41ff6acfb4dcfefc5076325c36525dac900f" +>>>>>>> Update html-diff-rs dependency +"checksum clap 2.25.0 (registry+https://github.com/rust-lang/crates.io-index)" = "867a885995b4184be051b70a592d4d70e32d7a188db6e8dff626af286a962771" "checksum cmake 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ebbb35d3dc9cd09497168f33de1acb79b265d350ab0ac34133b98f8509af1f" -"checksum crates-io 0.10.0 (git+https://github.com/rust-lang/cargo)" = "" "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97" -"checksum cssparser 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d8e562cb0d6ee9d8c367d3801d4dbaa0a0a94807745f710803b4ec4cf723ddd4" -"checksum curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c90e1240ef340dd4027ade439e5c7c2064dd9dc652682117bd50d1486a3add7b" -<<<<<<< HEAD -"checksum curl-sys 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "23e7e544dc5e1ba42c4a4a678bd47985e84b9c3f4d3404c29700622a029db9c3" ->>>>>>> Add warnings when rustdoc html rendering differs -<<<<<<< HEAD ->>>>>>> Add warnings when rustdoc html rendering differs -======= -======= -"checksum curl-sys 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)" = "f00c8ba847fb0730c293069b4d1203dc01bf3c2e1f90b4e55f426ed8f4a1eeac" ->>>>>>> Make html_diff compiles only after stage0 ->>>>>>> Make html_diff compiles only after stage0 +"checksum cssparser 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef6124306e5ebc5ab11891d063aeafdd0cdc308079b708c8b566125f3680292b" +"checksum cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "079adec4af52bb5275eadd004292028c79eb3c5f5b4ee8086a36d4197032f6df" +"checksum curl 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6689276ab61f97c660669a5ecc117c36875dfc1ba301c986b16c653415bdf9d7" +"checksum curl-sys 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d5481162dc4f424d088581db2f979fa7d4c238fe9794595de61d8d7522e277de" "checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850" "checksum debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9a032eac705ca39214d169f83e3d3da290af06d8d1d344d1baad2fd002dca4b3" "checksum derive-new 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41be6ca3b99e0c0483fb2389685448f650459c3ecbe4e18d7705d8010ec4ab8e" "checksum diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0a515461b6c8c08419850ced27bc29e86166dcdcde8fbe76f8b1f0589bb49472" -<<<<<<< HEAD "checksum docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3b5b93718f8b3e5544fcc914c43de828ca6c6ace23e0332c6080a2977b49787a" -======= -"checksum docopt 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab32ea6e284d87987066f21a9e809a73c14720571ef34516f0890b3d355ccfd8" -"checksum docopt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63e408eee8a772c5c61f62353992e3ebf51ef5c832dd04d986b3dc7d48c5b440" ->>>>>>> Make html_diff compiles only after stage0 "checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90" -"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -"checksum encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" "checksum enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" "checksum env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f" "checksum env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b" @@ -3699,9 +4161,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)" = "36df0166e856739905cd3d7e0b210fe818592211a008862599845e012d8d304c" "checksum fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc484842f1e2884faf56f529f960cc12ad8c71ce96cc7abba0a067c98fee344" "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d" -<<<<<<< HEAD -<<<<<<< HEAD "checksum fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866" +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d "checksum futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4b63a4792d4f8f686defe3b39b92127fea6344de5d38202b2ee5a11bbbf29d6a" "checksum gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)" = "120d07f202dcc3f72859422563522b66fe6463a4c513df062874daad05f85f0a" ======= @@ -3712,27 +4173,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ======= "checksum fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866" >>>>>>> Make html_diff compiles only after stage0 +======= +>>>>>>> Update unstable-crate test "checksum futf 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "51f93f3de6ba1794dcd5810b3546d004600a59a98266487c8407bc4b24e398f3" "checksum gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)" = "120d07f202dcc3f72859422563522b66fe6463a4c513df062874daad05f85f0a" -"checksum gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0912515a8ff24ba900422ecda800b52f4016a56251922d397c576bf92c690518" ->>>>>>> Add warnings when rustdoc html rendering differs "checksum getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685" "checksum git2 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aa01936ac96555c083c0e8553f672616274408d9d3fc5b8696603fbf63ff43ee" "checksum git2-curl 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "68676bc784bf0bef83278898929bf64a251e87c0340723d0b93fa096c9c5bf8e" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" "checksum globset 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "feeb1b6840809ef5efcf7a4a990bc4e1b7ee3df8cf9e2379a75aeb2ba42ac9c3" "checksum hamcrest 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bf088f042a467089e9baa4972f57f9247e42a0cc549ba264c7a04fbb8ecb89d4" -<<<<<<< HEAD "checksum handlebars 0.26.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fbba80e74e9591a5f6a4ffff6b7f9d645759a896e431cfbdc853e9184370294a" -======= -"checksum handlebars 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)" = "15bdf598fc3c2de40c6b340213028301c0d225eea55a2294e6cc148074e557a1" -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> Add warnings when rustdoc html rendering differs -======= -<<<<<<< HEAD ->>>>>>> Make html_diff compiles only after stage0 "checksum hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6a22814455d41612f41161581c2883c0c6a1c41852729b17d5ed88f01e153aa" +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe "checksum home 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9f25ae61099d8f3fee8b483df0bd4ecccf4b2731897aad40d50eca1b641fe6db" "checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d" @@ -3749,21 +4202,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" >>>>>>> Add warnings when rustdoc html rendering differs ======= ======= +======= +>>>>>>> Update unstable-crate test "checksum hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6a22814455d41612f41161581c2883c0c6a1c41852729b17d5ed88f01e153aa" "checksum html-diff 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8dcd098ed53623fb0f855acab766fced3353a5723314edeb0dad39720f26fed5" "checksum html5ever 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d60508177ec4e5774a112efcf4d4d5f123cb00a43476fa5940b7da568371a165" "checksum html5ever-atoms 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c626dc6733babf7110d3a5078b1529e9d0eaaacf6c488ef6a7437b7d515844bb" +======= +"checksum html-diff 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "17dbc64943cae56925cf9ff22e8c76ccdb8010f6675a1a56660ec7e597ffa7c7" +"checksum html5ever 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a49d5001dd1bddf042ea41ed4e0a671d50b1bf187e66b349d7ec613bdce4ad90" +>>>>>>> Update html-diff-rs dependency "checksum idna 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2233d4940b1f19f0418c158509cd7396b8d70a5db5705ce410914dc8fa603b37" +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +======= +>>>>>>> Update unstable-crate test "checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c" "checksum jobserver 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "443ae8bc0af6c106e6e8b77e04684faecc1a5ce94e058f4c2b0a037b0ea1b133" "checksum jsonrpc-core 7.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "903e5eee845f3d83c1436d12848d97b1247cf850ff06a8e1db2f1ce3543af2cf" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe "checksum languageserver-types 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d52e477b23bf52cd3ca0f9fc6c5d14be954eec97e3b9cdfbd962d911bd533caf" ======= <<<<<<< HEAD +<<<<<<< HEAD "checksum languageserver-types 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "680aee78c75504fdcb172635a7b7da0dccaafa4c42d935e19576c14b27942362" ======= <<<<<<< HEAD @@ -3773,7 +4237,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum languageserver-types 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97c2985bfcbbcb0189cfa25e1c10c1ac7111df2b6214b652c690127aefdf4e5b" >>>>>>> Add warnings when rustdoc html rendering differs >>>>>>> Add warnings when rustdoc html rendering differs +<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2 >>>>>>> Add warnings when rustdoc html rendering differs +======= +======= +"checksum kuchiki 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "529eda79bcc5e2803758350b2748600a595268fa892a6d1ba1657ee992c6cc18" +"checksum languageserver-types 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c178b944c3187527293fb9f8a0b0db3c5fb62eb127cacd65296f651a2440f5b1" +>>>>>>> Update unstable check test +>>>>>>> Update unstable check test "checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf" <<<<<<< HEAD "checksum libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)" = "8a014d9226c2cc402676fbe9ea2e15dd5222cd1dd57f576b5b283178c944a264" @@ -3782,42 +4253,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)" = "719aa0af4c241fa71d396ffdfe584aa758f08f35b4680ec3f03ecc2c3fe69b76" ======= <<<<<<< HEAD +<<<<<<< HEAD "checksum libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)" = "30885bcb161cf67054244d10d4a7f4835ffd58773bc72e07d35fecf472295503" ======= <<<<<<< HEAD +======= +>>>>>>> Update unstable-crate test "checksum libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)" = "38f5c2b18a287cf78b4097db62e20f43cace381dc76ae5c0a3073067f78b7ddc" >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 "checksum libgit2-sys 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "df18a822100352d9863b302faf6f8f25c0e77f0e60feb40e5dbe1238b7f13b1d" "checksum libssh2-sys 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0db4ec23611747ef772db1c4d650f8bd762f07b461727ec998f953c614024b75" -<<<<<<< HEAD "checksum libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdd64ef8ee652185674455c1d450b83cbc8ad895625d543b5324d923f82e4d8" "checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b" +<<<<<<< HEAD "checksum lzma-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "66b2e318eb97ab84f05725471f90c52a09c964053a5899a13fd0165acc26d00b" +======= +"checksum lzma-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "013fa6506eb7d26040c46dab9ecb7ccb4e2896b5bf24a9d65932501ea9f67af8" +<<<<<<< HEAD +>>>>>>> Update unstable-crate test "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376" <<<<<<< HEAD "checksum mdbook 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "22911d86cde6f80fa9f0fb2a68bbbde85d97af4fe0ce267141c83a4187d28700" ======= ======= -"checksum libz-sys 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e5ee912a45d686d393d5ac87fac15ba0ba18daae14e8e7543c63ebf7fb7e970c" -"checksum log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5141eca02775a762cc6cd564d8d2c50f67c0ea3a372cbf1c51592b3e029e10ad" -"checksum lzma-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fedff6a5cbb24494ec6ee4784e9ac5c187161fede04c7767d49bf87544013afa" -"checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" -"checksum matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "efd7622e3022e1a6eaa602c4cea8912254e5582c9c692e9167714182244801b1" ->>>>>>> Add warnings when rustdoc html rendering differs +>>>>>>> Update html-diff-rs dependency ======= -"checksum libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)" = "e7eb6b826bfc1fdea7935d46556250d1799b7fe2d9f7951071f4291710665e3e" +"checksum kuchiki 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ef2ea4f2f7883cd7c6772b06c14abca01a2cc1f75c426cebffcf6b3b925ef9fc" +"checksum languageserver-types 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "680aee78c75504fdcb172635a7b7da0dccaafa4c42d935e19576c14b27942362" +"checksum lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf" +"checksum libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)" = "30885bcb161cf67054244d10d4a7f4835ffd58773bc72e07d35fecf472295503" +>>>>>>> Update html-diff-rs dependency "checksum libgit2-sys 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "df18a822100352d9863b302faf6f8f25c0e77f0e60feb40e5dbe1238b7f13b1d" "checksum libssh2-sys 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0db4ec23611747ef772db1c4d650f8bd762f07b461727ec998f953c614024b75" -"checksum libz-sys 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "e70195f655a44af531ad7135b1ec2a0a82522b451fe09730fbb25674a85996e7" +"checksum libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdd64ef8ee652185674455c1d450b83cbc8ad895625d543b5324d923f82e4d8" "checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b" "checksum lzma-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "013fa6506eb7d26040c46dab9ecb7ccb4e2896b5bf24a9d65932501ea9f67af8" "checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" +"checksum markup5ever 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5050cc22c1d567a9b99bcbe9ffbd8f3127b3d146994105480240dc8ba4f4f2ef" "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376" ->>>>>>> Make html_diff compiles only after stage0 -"checksum mdbook 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)" = "f1e2e9d848514dcfad4195788d0d42ae5153a477c191d75d5b84fab10f222fbd" ->>>>>>> Add warnings when rustdoc html rendering differs +"checksum mdbook 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "22911d86cde6f80fa9f0fb2a68bbbde85d97af4fe0ce267141c83a4187d28700" "checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" "checksum memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4" "checksum miniz-sys 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "28eaee17666671fa872e567547e8428e83308ebe5808cdf6a0e28397dbe2c726" @@ -3844,8 +4321,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum num-iter 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)" = "f7d1891bd7b936f12349b7d1403761c8a0b85a18b148e9da4429d5d102c1a41e" "checksum num-rational 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "33c881e104a26e1accc09449374c095ff2312c8e0c27fab7bbefe16eac7c776d" "checksum num-traits 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "1708c0628602a98b52fad936cf3edb9a107af06e52e49fdf0707e884456a6af6" +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d <<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +>>>>>>> Update unstable-crate test "checksum num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584" "checksum open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3478ed1686bd1300c8a981a940abc92b06fac9cbef747f4c668d4e032ff7b842" "checksum openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)" = "085aaedcc89a2fac1eb2bc19cd66f29d4ea99fec60f82a5f3a88a6be7dbd90b5" @@ -3857,6 +4337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "ad95f8160d1c150c4f44d4c4959732e048ac046c37f597fe362f8bf57561ffb4" ======= "checksum openssl-sys 0.9.14 (registry+https://github.com/rust-lang/crates.io-index)" = "236c718c2e2c2b58a546d86ffea5194400bb15dbe01ca85325ffd357b03cf66c" +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d ======= "checksum num_cpus 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6e416ba127a4bb3ff398cb19546a8d0414f73352efe2857f4060d36f5fe5983a" "checksum open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3478ed1686bd1300c8a981a940abc92b06fac9cbef747f4c668d4e032ff7b842" @@ -3865,7 +4346,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum openssl-sys 0.9.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e035022a50faa380bd7ccdbd184d946ce539ebdb0a358780de92a995882af97a" >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" "checksum percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de154f638187706bde41d9b4738748933d64e6b37bdbffc0b47a97d16a6ae356" "checksum pest 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0a6dda33d67c26f0aac90d324ab2eb7239c819fc7b2552fe9faa4fe88441edc8" @@ -3874,6 +4360,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6b07ffcc532ccc85e3afc45865469bf5d9e4ef5bfcf9622e3cfe80c2d275ec03" "checksum phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "07e24b0ca9643bdecd0632f2b3da6b1b89bbb0030e0b992afc1113b23a7bc2f2" "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903" +"checksum precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf1fc3616b3ef726a847f2cd2388c646ef6a1f1ba4835c2629004da48184150" +"checksum procedural-masquerade 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c93cdc1fb30af9ddf3debc4afbdb0f35126cbd99daa229dd76cdd5349b41d989" "checksum psapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "abcd5d1a07d360e29727f757a9decb3ce8bc6e0efa8969cfaad669a8317a2478" "checksum pulldown-cmark 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9ab1e588ef8efd702c7ed9d2bd774db5e6f4d878bb5a1a9f371828fbdff6973" "checksum quick-error 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c36987d4978eb1be2e422b1e0423a557923a5c3e7e6f31d5699e9aafaefa469" @@ -3881,6 +4369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "checksum racer 2.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "f120c7510ef7aff254aeb06067fb6fac573ec96a1660e194787cf9dced412bf0" ======= ======= @@ -3899,8 +4388,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ======= "checksum racer 2.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "edf2dfc188373ef96168bec3646a0415c5c21111c6144c0c36104fc720587ecd" >>>>>>> Make html_diff compiles only after stage0 +======= +"checksum racer 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9079a128fdb6f0c8850010e1478b215d4c00134654bf995bfda41824951ce9bd" +>>>>>>> Update unstable-crate test "checksum rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "022e0636ec2519ddae48154b028864bdce4eaf7d35226ab8e65c611be97b189d" -"checksum ref_slice 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "825740057197b7d43025e7faf6477eaabc03434e153233da02d1f44602f71527" "checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" "checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b" "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" @@ -3911,7 +4402,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ffd34691a510938bb67fe0444fb363103c73ffb31c121d1e16bc92d8945ea8ff" "checksum rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e" "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" +<<<<<<< HEAD +<<<<<<< HEAD "checksum rustfmt-nightly 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6eea0d0590ae793fc4d281df56e01dc7531575c8ed9a72fadf5fdc7305a0d32f" +======= +======= +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +>>>>>>> Update html-diff-rs dependency +<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2 +"checksum rustfmt-nightly 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa1ffc66e1e1786355f22e8a958a57bd67fbf9564f522f87f31de9586715f8f6" +======= +<<<<<<< HEAD +"checksum rustfmt-nightly 0.1.8 (git+https://github.com/rust-lang-nursery/rustfmt?branch=rustfmt-42492)" = "" +======= +"checksum rustfmt-nightly 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ccadd3e5b64b339456f2b8accac5d11423aca8e4fc9140d0fff4bfca4e67e5b3" +>>>>>>> Update unstable check test +>>>>>>> Update unstable check test +>>>>>>> Update unstable check test "checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7" "checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d" <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 @@ -3923,13 +4430,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum selectors 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cc733b58ea460d56f470ace2ecdd6e0bd724499a1d495998706537b01630390f" "checksum semver 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdd61b85a0fa777f7fb7c454b9189b2941b110d1385ce84d7f76efdf1606a85" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +<<<<<<< HEAD "checksum serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f7726f29ddf9731b17ff113c461e362c381d9d69433f79de4f3dd572488823e9" "checksum serde_derive 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cf823e706be268e73e7747b147aa31c8f633ab4ba31f115efb57e5047c3a76dd" +======= +<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2 +"checksum serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "433d7d9f8530d5a939ad5e0e72a6243d2e42a24804f70bf592c679363dcacb2f" +"checksum serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "7b707cf0d4cab852084f573058def08879bb467fda89d99052485e7d00edd624" +======= +<<<<<<< HEAD +======= +"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" +>>>>>>> Update unstable check test +"checksum serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6a7c6b751a2e8d5df57a5ff71b5b4fc8aaee9ee28ff1341d640dd130bb5f4f7a" +"checksum serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "2f6ca58905ebd3c3b285a8a6d4f3ac92b92c0d7951d5649b1bdd212549c06639" +>>>>>>> Update unstable check test +<<<<<<< HEAD +>>>>>>> Update unstable check test +======= +======= +"checksum rustfmt-nightly 0.1.8 (git+https://github.com/rust-lang-nursery/rustfmt?branch=rustfmt-42492)" = "" +"checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7" +"checksum scoped-tls 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f417c22df063e9450888a7561788e9bd46d3bb3c1466435b4eccb903807f147d" +"checksum selectors 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3c89b1c6a3c029c82263f7dd2d44d0005ee7374eb09e254ab59dede4353a8c0" +"checksum semver 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdd61b85a0fa777f7fb7c454b9189b2941b110d1385ce84d7f76efdf1606a85" +"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +"checksum serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "433d7d9f8530d5a939ad5e0e72a6243d2e42a24804f70bf592c679363dcacb2f" +"checksum serde_derive 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "7b707cf0d4cab852084f573058def08879bb467fda89d99052485e7d00edd624" +>>>>>>> Update html-diff-rs dependency +>>>>>>> Update html-diff-rs dependency "checksum serde_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37aee4e0da52d801acfbc0cc219eb1eda7142112339726e427926a6f6ee65d3a" "checksum serde_ignored 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c10e798e4405d7dcec3658989e35ee6706f730a9ed7c1184d5ebd84317e82f46" "checksum serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "48b04779552e92037212c3615370f6bd57a40ebba7f20e554ff9f55e41a69a7b" "checksum shell-escape 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "dd5cc96481d54583947bfe88bf30c23d53f883c6cd0145368b69989d97b84ef8" <<<<<<< HEAD +<<<<<<< HEAD "checksum socket2 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4daf80fcf54186fac4fe049e0b39d36a5cfde69a11a06413e61e77f553cccf9a" ======= <<<<<<< HEAD @@ -3938,27 +4473,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537" >>>>>>> Add warnings when rustdoc html rendering differs >>>>>>> Add warnings when rustdoc html rendering differs +======= +"checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537" +"checksum smallvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4f8266519bc1d17d0b5b16f6c21295625d562841c708f6376f49028a43e9c11e" +"checksum socket2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "12cdbddbaa27bf94cc194b8e37f5811db6fe83cea96cf99cf1f8e92b65a41371" +>>>>>>> Update unstable-crate test "checksum stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "15132e0e364248108c5e2c02e3ab539be8d6f5d52a01ca9bbf27ed657316f02b" -<<<<<<< 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 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2fa69b90c5398217fb0414706d1becea9325ad21ed5d87bd6dda82127911f324" +"checksum string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "479cde50c3539481f33906a387f2bd17c8e87cb848c35b6021d41fb81ff9b4d7" "checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc" "checksum strings 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da75d8bf2c4d210d63dd09581a041b036001f9f6e03d9b151dbff810fb7ba26a" -<<<<<<< HEAD ->>>>>>> Add warnings when rustdoc html rendering differs ->>>>>>> Add warnings when rustdoc html rendering differs -======= ->>>>>>> Make html_diff compiles only after stage0 "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694" -"checksum syn 0.10.8 (registry+https://github.com/rust-lang/crates.io-index)" = "58fd09df59565db3399efbba34ba8a2fec1307511ebd245d0061ff9d42691673" "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" "checksum syn 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6ae6fb0dcc9bd85f89a1a4adc0df2fd90c90c98849d61433983dd7a9df6363f7" "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" @@ -3967,21 +4492,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum syntex_syntax 0.52.0 (registry+https://github.com/rust-lang/crates.io-index)" = "76a302e717e348aa372ff577791c3832395650073b8d8432f8b3cb170b34afde" "checksum tar 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "281285b717926caa919ad905ef89c63d75805c7d89437fb873100925a53f2b1b" "checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6" -<<<<<<< HEAD +"checksum tendril 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1b72f8e2f5b73b65c315b1a70c730f24b9d7a25f39e98de8acbe2bb795caea" "checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1" "checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209" "checksum termcolor 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5193a56b8d82014662c4b933dea6bec851daf018a2b01722e007daaf5f9dca" <<<<<<< HEAD +<<<<<<< HEAD "checksum textwrap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f728584ea33b0ad19318e20557cb0a39097751dbb07171419673502f848c7af6" ======= <<<<<<< HEAD "checksum textwrap 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f86300c3e7416ee233abd7cda890c492007a3980f941f79185c753a701257167" ======= ======= +======= +>>>>>>> Update unstable-crate test "checksum tendril 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4ce04c250d202db8004921e3d3bc95eaa4f2126c6937a428ae39d12d0e38df62" -"checksum term 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d168af3930b369cfe245132550579d47dfd873d69470755a19c2c6568dbbd989" +"checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1" "checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209" <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Add warnings when rustdoc html rendering differs <<<<<<< HEAD >>>>>>> Add warnings when rustdoc html rendering differs @@ -3993,12 +4522,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum termcolor 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5193a56b8d82014662c4b933dea6bec851daf018a2b01722e007daaf5f9dca" >>>>>>> Make html_diff compiles only after stage0 >>>>>>> Make html_diff compiles only after stage0 +<<<<<<< HEAD >>>>>>> Make html_diff compiles only after stage0 +======= +======= +"checksum termcolor 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5193a56b8d82014662c4b933dea6bec851daf018a2b01722e007daaf5f9dca" +>>>>>>> Update unstable-crate test +>>>>>>> Update unstable-crate test +======= +"checksum textwrap 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f86300c3e7416ee233abd7cda890c492007a3980f941f79185c753a701257167" +>>>>>>> Update html-diff-rs dependency "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" "checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" "checksum thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14" "checksum toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4" <<<<<<< HEAD +<<<<<<< HEAD "checksum toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7540f4ffc193e0d3c94121edb19b055670d369f77d5804db11ae053a45b6e7e" "checksum typed-arena 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5934776c3ac1bea4a9d56620d6bf2d483b20d394e49581db40f187e1118ff667" "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" @@ -4009,13 +4548,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ======= "checksum toml 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bd86ad9ebee246fdedd610e0f6d0587b754a3d81438db930a244d0480ed7878f" <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> Add warnings when rustdoc html rendering differs +======= +>>>>>>> Update unstable-crate test +======= +>>>>>>> Update html-diff-rs dependency "checksum toml 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b0601da6c97135c8d330c7a13a013ca6cd4143221b01de2f8d4edc50a9e551c7" "checksum typed-arena 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5934776c3ac1bea4a9d56620d6bf2d483b20d394e49581db40f187e1118ff667" "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" "checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f" -<<<<<<< HEAD "checksum unicode-segmentation 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18127285758f0e2c6cf325bb3f3d138a12fee27de4f23e146cd6a179f26c2cf3" +<<<<<<< HEAD ======= ======= "checksum toml 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4cc5dbfb20a481e64b99eb7ae280859ec76730c7191570ba5edaa962394edb0a" @@ -4023,23 +4567,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a6a2c4e3710edd365cd7e78383153ed739fa31af19f9172f72d3575060f5a43a" "checksum unicode-normalization 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e28fa37426fceeb5cf8f41ee273faa7c82c47dc8fba5853402841e665fcd86ff" >>>>>>> Add warnings when rustdoc html rendering differs +======= +>>>>>>> Update unstable-crate test "checksum unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8083c594e02b8ae1654ae26f0ade5158b119bd88ad0e8227a5d8fcd72407946" >>>>>>> Add warnings when rustdoc html rendering differs >>>>>>> Add warnings when rustdoc html rendering differs +======= +>>>>>>> Update html-diff-rs dependency "checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f" "checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb" "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" -<<<<<<< HEAD -"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" -======= "checksum unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91" -<<<<<<< HEAD ->>>>>>> Make html_diff compiles only after stage0 +"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" "checksum url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb819346883532a271eb626deb43c4a1bb4c4dd47c519bd78137c3e72a4fe27" -======= -"checksum url 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a69a2e36a5e5ed3f3063c8c64a3b028c4d50d689fa6c862abd7cfe65f882595c" ->>>>>>> Make html_diff compiles only after stage0 "checksum url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74e7d099f1ee52f823d4bdd60c93c3602043c728f5db3b97bdb548467f7bddea" +<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f +<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe "checksum userenv-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71d28ea36bbd9192d75bd9fa9b39f96ddb986eaee824adae5d53b6e51919b2f3" ======= @@ -4050,24 +4593,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b" ======= "checksum user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47" +======= +>>>>>>> Update unstable-crate test "checksum utf-8 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9aee9ba280438b56d1ebc5329f2094f0ff457f811eeeff0b278d75aa99db400" +======= +"checksum utf-8 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b6f923c601c7ac48ef1d66f7d5b5b2d9a7ba9c51333ab75a3ddf8d0309185a56" +>>>>>>> Update html-diff-rs dependency "checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122" -<<<<<<< HEAD ->>>>>>> Add warnings when rustdoc html rendering differs -======= -"checksum vcpkg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df74ff70e2ced9607f67e06640f89a6a6374b459b51bdef290a5cfa657fe4fcc" ->>>>>>> Make html_diff compiles only after stage0 +"checksum vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b" "checksum vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c" "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" "checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" -<<<<<<< HEAD "checksum wincolor 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a39ee4464208f6430992ff20154216ab2357772ac871d994c51628d60e58b8b0" -======= -"checksum wincolor 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "99c2af1426e2166e6f66d88b09b2a4d63afce06875f149174e386f2f1ee9779b" ->>>>>>> Make html_diff compiles only after stage0 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" "checksum xattr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "5f04de8a1346489a2f9e9bd8526b73d135ec554227b17568456e86aa35b6f3fc" "checksum xz2 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e9510bdf100731599107c61f77daf46713a69a568f75458999c1f9dbf6ba25b0" diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml index c6a7cec52ff..96fdf6dfa55 100644 --- a/src/librustdoc/Cargo.toml +++ b/src/librustdoc/Cargo.toml @@ -13,8 +13,8 @@ env_logger = { version = "0.4", default-features = false } log = "0.3" pulldown-cmark = { version = "0.0.14", default-features = false } -[target.'cfg(not(stage0))'.dependencies] -html-diff = "0.0.2" +[target.'cfg(not(any(stage0, stage1)))'.dependencies] +html-diff = "0.0.3" [build-dependencies] build_helper = { path = "../build_helper" } diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 27c67e2a4bc..ae4f75efd5a 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -75,7 +75,7 @@ use html::item_type::ItemType; use html::markdown::{self, Markdown, MarkdownHtml, MarkdownSummaryLine, RenderType}; use html::{highlight, layout}; -#[cfg(not(stage0))] +#[cfg(not(any(stage0, stage1)))] use html_diff; /// A pair of name and its optional document. @@ -1648,7 +1648,7 @@ fn document(w: &mut fmt::Formatter, cx: &Context, item: &clean::Item) -> fmt::Re Ok(()) } -#[cfg(not(stage0))] +#[cfg(not(any(stage0, stage1)))] fn get_html_diff(w: &mut fmt::Formatter, md_text: &str, render_type: RenderType, prefix: &str) -> fmt::Result { if render_type == RenderType::Pulldown { @@ -1671,9 +1671,10 @@ fn get_html_diff(w: &mut fmt::Formatter, md_text: &str, render_type: RenderType, } } -#[cfg(stage0)] -fn get_html_diff(w: &mut fmt::Formatter, md_text: &str, render_type: RenderType) -> fmt::Result { - write!(w, "
{}
", Markdown(md_text, render_type)) +#[cfg(any(stage0, stage1))] +fn get_html_diff(w: &mut fmt::Formatter, md_text: &str, render_type: RenderType, + prefix: &str) -> fmt::Result { + write!(w, "
{}{}
", prefix, Markdown(md_text, render_type)) } fn document_short(w: &mut fmt::Formatter, item: &clean::Item, link: AssocItemLink, @@ -1685,7 +1686,7 @@ fn document_short(w: &mut fmt::Formatter, item: &clean::Item, link: AssocItemLin } else { format!("{}", &plain_summary_line(Some(s))) }; - get_html_diff(&markdown, render_type, prefix)?; + get_html_diff(w, &markdown, render_type, prefix)?; } else if !prefix.is_empty() { write!(w, "
{}
", prefix)?; } @@ -1709,7 +1710,7 @@ fn render_assoc_const_value(item: &clean::Item) -> String { fn document_full(w: &mut fmt::Formatter, item: &clean::Item, render_type: RenderType, prefix: &str) -> fmt::Result { if let Some(s) = item.doc_value() { - get_html_diff(format!("{}{}", md_render_assoc_item(item), s), render_type, prefix)?; + get_html_diff(w, s, render_type, prefix)?; } else if !prefix.is_empty() { write!(w, "
{}
", prefix)?; } diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index d45513489ab..cc7893c227c 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -28,7 +28,7 @@ extern crate arena; extern crate getopts; extern crate env_logger; -#[cfg(not(stage0))] +#[cfg(not(any(stage0, stage1)))] extern crate html_diff; extern crate libc; extern crate rustc; diff --git a/src/test/run-make/sysroot-crates-are-unstable/Makefile b/src/test/run-make/sysroot-crates-are-unstable/Makefile index 4b7052f9b94..63fa7e3a0f1 100644 --- a/src/test/run-make/sysroot-crates-are-unstable/Makefile +++ b/src/test/run-make/sysroot-crates-are-unstable/Makefile @@ -1,35 +1,4 @@ --include ../tools.mk +PYTHON=python -# This is a whitelist of files which are stable crates or simply are not crates, -# we don't check for the instability of these crates as they're all stable! -STABLE_CRATES := \ - std \ - core \ - proc_macro \ - rsbegin.o \ - rsend.o \ - dllcrt2.o \ - crt2.o \ - clang_rt.%_dynamic.dylib - -# Generate a list of all crates in the sysroot. To do this we list all files in -# rustc's sysroot, look at the filename, strip everything after the `-`, and -# strip the leading `lib` (if present) -SYSROOT := $(shell $(RUSTC) --print sysroot) -LIBS := $(wildcard $(SYSROOT)/lib/rustlib/$(TARGET)/lib/*) -LIBS := $(foreach lib,$(LIBS),$(notdir $(lib))) -LIBS := $(foreach lib,$(LIBS),$(word 1,$(subst -, ,$(lib)))) -LIBS := $(foreach lib,$(LIBS),$(patsubst lib%,%,$(lib))) -LIBS := $(filter-out $(STABLE_CRATES),$(LIBS)) - -all: $(foreach lib,$(LIBS),check-crate-$(lib)-is-unstable) - -check-crate-%-is-unstable: - @echo verifying $* is an unstable crate - @echo 'extern crate $*;' | \ - $(RUSTC) - --crate-type rlib 2>&1 | cat > $(TMPDIR)/$*; \ - true - @grep -q 'use of unstable library feature' $(TMPDIR)/$* || \ - (echo crate $* is not unstable && \ - cat $(TMPDIR)/$* && \ - false) +all: + python test.py diff --git a/src/test/run-make/sysroot-crates-are-unstable/test.py b/src/test/run-make/sysroot-crates-are-unstable/test.py new file mode 100644 index 00000000000..210059e1010 --- /dev/null +++ b/src/test/run-make/sysroot-crates-are-unstable/test.py @@ -0,0 +1,71 @@ +# Copyright 2015 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. + +import sys +import os +from os import listdir +from os.path import isfile, join +from subprocess import PIPE, Popen + + +# This is a whitelist of files which are stable crates or simply are not crates, +# we don't check for the instability of these crates as they're all stable! +STABLE_CRATES = ['std', 'core', 'proc_macro', 'rsbegin.o', 'rsend.o', 'dllcrt2.o', 'crt2.o', + 'clang_rt'] + + +def convert_to_string(s): + if s.__class__.__name__ == 'bytes': + return s.decode('utf-8') + return s + + +def exec_command(command, to_input=None): + child = None + if to_input is None: + child = Popen(command, stdout=PIPE, stderr=PIPE) + else: + child = Popen(command, stdout=PIPE, stderr=PIPE, stdin=PIPE) + stdout, stderr = child.communicate(input=to_input) + return (convert_to_string(stdout), convert_to_string(stderr)) + + +def check_lib(lib): + if lib['name'] in STABLE_CRATES: + return True + print('verifying if {} is an unstable crate'.format(lib['name'])) + stdout, stderr = exec_command([os.environ['RUSTC'], '-', '--crate-type', 'rlib', + '--extern', '{}={}'.format(lib['name'], lib['path'])], + to_input='extern crate {};'.format(lib['name'])) + if not 'use of unstable library feature' in '{}{}'.format(stdout, stderr): + print('crate {} "{}" is not unstable'.format(lib['name'], lib['path'])) + print('{}{}'.format(stdout, stderr)) + print('') + return False + return True + +# Generate a list of all crates in the sysroot. To do this we list all files in +# rustc's sysroot, look at the filename, strip everything after the `-`, and +# strip the leading `lib` (if present) +def get_all_libs(dir_path): + return [{ 'path': join(dir_path, f), 'name': f[3:].split('-')[0] } + for f in listdir(dir_path) + if isfile(join(dir_path, f)) and f.endswith('.rlib') and f not in STABLE_CRATES] + + +sysroot = exec_command([os.environ['RUSTC'], '--print', 'sysroot'])[0].replace('\n', '') +libs = get_all_libs(join(sysroot, 'lib/rustlib/{}/lib'.format(os.environ['TARGET']))) + +ret = 0 +for lib in libs: + if not check_lib(lib): + # We continue so users can see all the not unstable crates. + ret = 1 +sys.exit(ret) diff --git a/src/test/rustdoc/issue-12834.rs b/src/test/rustdoc/issue-12834.rs index 48d63d9566a..30dce27e738 100644 --- a/src/test/rustdoc/issue-12834.rs +++ b/src/test/rustdoc/issue-12834.rs @@ -15,7 +15,7 @@ // @has issue_12834/fn.foo.html // @has - //pre 'a + b ' -/// ```text +/// ``` /// a + b ∈ Self ∀ a, b ∈ Self /// ``` pub fn foo() {} From 33d99e526e20ae4187644371c08df761c1024b2c Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Fri, 14 Jul 2017 12:30:17 +0200 Subject: [PATCH 3/8] Set python binary name to python 2.7 --- src/Cargo.lock | 721 +++++++++--------- .../sysroot-crates-are-unstable/Makefile | 4 +- 2 files changed, 379 insertions(+), 346 deletions(-) diff --git a/src/Cargo.lock b/src/Cargo.lock index 1640ab10578..02f5adcc0b1 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -81,6 +81,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -132,6 +133,9 @@ dependencies = [ "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 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -145,6 +149,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)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD @@ -184,6 +189,9 @@ dependencies = [ "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 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -196,6 +204,7 @@ 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 <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -232,6 +241,9 @@ dependencies = [ "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 ] [[package]] @@ -266,9 +278,8 @@ dependencies = [ "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD "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)", @@ -280,15 +291,25 @@ dependencies = [ "toml 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ======= <<<<<<< HEAD -<<<<<<< HEAD ======= ->>>>>>> Update html-diff-rs dependency - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> 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 "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)", + "toml 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update to last master ] [[package]] @@ -306,7 +327,11 @@ 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 "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 ] [[package]] @@ -318,55 +343,17 @@ dependencies = [ [[package]] name = "cargo" -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d -<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe version = "0.22.0" +<<<<<<< HEAD source = "git+https://github.com/rust-lang/cargo#bcf3997b1fa177afc5b6c632a6fbbf6cc75df427" +======= +source = "git+https://github.com/rust-lang/cargo#305bc25d5e105e84ffe261655b46cf74570f6e5b" +>>>>>>> Update to last master replace = "cargo 0.22.0" -======= -<<<<<<< HEAD -======= ->>>>>>> Update unstable-crate test -version = "0.21.0" -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f -<<<<<<< HEAD -<<<<<<< HEAD -source = "git+https://github.com/rust-lang/cargo#1566c92b5d28e435613918e59dc94755f99d73b1" -replace = "cargo 0.21.0" -======= -<<<<<<< HEAD -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d -source = "git+https://github.com/rust-lang/cargo#ac04d2e0afa95cb749406f4934421342506da4f2" -replace = "cargo 0.20.0" ->>>>>>> Add warnings when rustdoc html rendering differs ->>>>>>> Add warnings when rustdoc html rendering differs -======= -source = "git+https://github.com/rust-lang/cargo#eb6cf012a6cc23c9c89c4009564de9fccc38b9cb" ->>>>>>> Update unstable-crate test -======= -source = "git+https://github.com/rust-lang/cargo#854bc167bbf74053f821f65cb86d506033f3d3a7" ->>>>>>> Update unstable-crate test -======= -source = "git+https://github.com/rust-lang/cargo#cc8aa6f03274a91c3f3d86835ab36eb7de5099f0" ->>>>>>> Update unstable check test -======= -source = "git+https://github.com/rust-lang/cargo#74e54214c9d13871934fde0ecb07250e523c4e92" ->>>>>>> Update html-diff-rs dependency -replace = "cargo 0.21.0" ->>>>>>> Update unstable-crate test [[package]] name = "cargo" -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 version = "0.22.0" -======= -version = "0.21.0" -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d -======= ->>>>>>> Make html_diff compiles only after stage0 ->>>>>>> Make html_diff compiles only after stage0 -======= ->>>>>>> Update unstable-crate test dependencies = [ "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -375,15 +362,7 @@ dependencies = [ "core-foundation 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "crates-io 0.11.0", "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "curl 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -======= ->>>>>>> Update unstable-crate test - "curl 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 "docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "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)", @@ -399,11 +378,16 @@ dependencies = [ "ignore 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "jobserver 0.1.6 (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)", +======= + "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update to last master "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.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD <<<<<<< HEAD "openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -429,6 +413,9 @@ dependencies = [ ======= >>>>>>> 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 "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)", @@ -441,7 +428,11 @@ 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 "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 "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)", ] @@ -464,6 +455,7 @@ dependencies = [ ======= "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -479,29 +471,11 @@ dependencies = [ <<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (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 "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 -======= ->>>>>>> Update unstable-crate test - "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 -<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2 ->>>>>>> Make html_diff compiles only after stage0 -======= -======= - "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update unstable check test ->>>>>>> Update unstable check test -======= - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update html-diff-rs dependency + "serde 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)", @@ -569,6 +543,7 @@ dependencies = [ "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -587,6 +562,9 @@ dependencies = [ ======= >>>>>>> Update unstable-crate test >>>>>>> Update unstable-crate test +======= + "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update to last master "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)", ] @@ -595,6 +573,14 @@ dependencies = [ name = "completion" version = "0.1.0" +[[package]] +name = "conv" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "core" version = "0.0.0" @@ -667,6 +653,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "curl-sys 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -699,6 +686,9 @@ dependencies = [ "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 "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)", @@ -725,7 +715,11 @@ version = "0.3.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.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 "libz-sys 1.0.16 (registry+https://github.com/rust-lang/crates.io-index)", "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)", @@ -733,6 +727,11 @@ dependencies = [ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "custom_derive" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "dbghelp-sys" version = "0.2.0" @@ -772,6 +771,7 @@ 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)", @@ -820,6 +820,10 @@ dependencies = [ "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)", ] @@ -883,6 +887,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -927,6 +932,9 @@ dependencies = [ "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 ] [[package]] @@ -947,6 +955,7 @@ version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -983,6 +992,9 @@ dependencies = [ "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 "miniz-sys 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1007,6 +1019,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1043,15 +1056,13 @@ dependencies = [ "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 "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" @@ -1059,7 +1070,11 @@ 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 = "futures" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "gcc" @@ -1078,6 +1093,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1104,6 +1120,9 @@ dependencies = [ "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 "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)", @@ -1174,26 +1193,6 @@ name = "hex" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "html-diff" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "kuchiki 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "html5ever" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "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)", - "markup5ever 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "highlight" version = "0.1.0" @@ -1214,6 +1213,26 @@ dependencies = [ name = "hover" version = "0.1.0" +[[package]] +name = "html-diff" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "kuchiki 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "html5ever" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "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)", + "markup5ever 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "idna" version = "0.1.4" @@ -1277,6 +1296,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1314,6 +1334,10 @@ dependencies = [ >>>>>>> Update html-diff-rs dependency >>>>>>> Update html-diff-rs dependency "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", +======= + "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update to last master ] [[package]] @@ -1377,6 +1401,7 @@ dependencies = [ name = "libc" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "0.2.29" ======= ======= @@ -1412,6 +1437,9 @@ version = "0.2.24" version = "0.2.26" >>>>>>> Update html-diff-rs dependency >>>>>>> Update html-diff-rs dependency +======= +version = "0.2.28" +>>>>>>> Update to last master source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1422,9 +1450,14 @@ dependencies = [ "cmake 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "curl-sys 0.3.14 (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)", +======= + "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update to last master "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 "openssl-sys 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1448,6 +1481,9 @@ dependencies = [ ======= >>>>>>> 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 "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1458,6 +1494,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cmake 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1467,18 +1504,19 @@ dependencies = [ <<<<<<< 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)", ======= -<<<<<<< HEAD -<<<<<<< HEAD +>>>>>>> Update to last master ======= ->>>>>>> Update html-diff-rs dependency - "libc 0.2.26 (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 "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 ======= @@ -1493,6 +1531,9 @@ dependencies = [ ======= >>>>>>> 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 "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1502,7 +1543,11 @@ version = "1.0.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)", +<<<<<<< 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 "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)", ] @@ -1524,6 +1569,7 @@ dependencies = [ "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1560,6 +1606,9 @@ dependencies = [ "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 ] [[package]] @@ -1567,6 +1616,23 @@ name = "mac" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "magenta" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "conv 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "magenta-sys" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "markup5ever" version = "0.3.1" @@ -1591,6 +1657,7 @@ 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)", ======= @@ -1606,6 +1673,9 @@ dependencies = [ "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)", @@ -1614,7 +1684,11 @@ 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 "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 ] [[package]] @@ -1623,6 +1697,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1659,6 +1734,9 @@ dependencies = [ "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 ] [[package]] @@ -1667,6 +1745,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1703,6 +1782,9 @@ dependencies = [ "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 ] [[package]] @@ -1712,6 +1794,7 @@ 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 <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1748,6 +1831,9 @@ dependencies = [ "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 ] [[package]] @@ -1773,6 +1859,7 @@ dependencies = [ "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1809,6 +1896,9 @@ dependencies = [ "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 "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)", ] @@ -1833,7 +1923,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num-integer 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1885,6 +1975,7 @@ version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -1922,6 +2013,9 @@ dependencies = [ "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 ] [[package]] @@ -1937,6 +2031,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "openssl" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "0.9.17" ======= ======= @@ -1958,12 +2053,16 @@ version = "0.9.13" version = "0.9.14" >>>>>>> Update unstable-crate test >>>>>>> Update unstable-crate test +======= +version = "0.9.15" +>>>>>>> Update to last master source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD @@ -1976,9 +2075,9 @@ dependencies = [ <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 - "openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", ======= <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -2007,6 +2106,11 @@ dependencies = [ "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 ] [[package]] @@ -2018,17 +2122,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "openssl-sys" <<<<<<< 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)", ======= @@ -2067,6 +2175,9 @@ dependencies = [ >>>>>>> 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 "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)", ] @@ -2130,7 +2241,7 @@ 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)", + "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2210,6 +2321,7 @@ name = "racer" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "2.0.10" ======= ======= @@ -2229,12 +2341,16 @@ version = "2.0.8" ======= 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)", @@ -2244,6 +2360,8 @@ dependencies = [ ======= "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)", @@ -2260,10 +2378,11 @@ dependencies = [ [[package]] name = "rand" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -2273,10 +2392,13 @@ dependencies = [ <<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Make html_diff compiles only after stage0 +======= + "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", + "magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update to last master ] [[package]] -<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe name = "reformat" version = "0.1.0" @@ -2285,39 +2407,6 @@ name = "reformat_with_range" version = "0.1.0" [[package]] -======= -======= -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update html-diff-rs dependency - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f -======= ->>>>>>> Make html_diff compiles only after stage0 ->>>>>>> Make html_diff compiles only after stage0 -<<<<<<< HEAD -======= ->>>>>>> Update unstable-crate test - "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[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 -======= ->>>>>>> Update html-diff-rs dependency name = "regex" version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2370,6 +2459,7 @@ 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 "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)", @@ -2381,10 +2471,13 @@ dependencies = [ <<<<<<< 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 @@ -2429,8 +2522,14 @@ dependencies = [ >>>>>>> Make html_diff compiles only after stage0 ======= >>>>>>> Update unstable check test +======= + "racer 2.0.10 (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)", +>>>>>>> Update to last master "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)", @@ -2477,6 +2576,13 @@ dependencies = [ >>>>>>> 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)", + "toml 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update to last master "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)", ] @@ -2521,6 +2627,7 @@ 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)", ======= @@ -2541,6 +2648,9 @@ dependencies = [ ======= "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)", ] @@ -2560,18 +2670,7 @@ dependencies = [ "flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "fmt_macros 0.0.0", "graphviz 0.0.0", -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "jobserver 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< 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 -======= - "jobserver 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update unstable-crate test "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_back 0.0.0", @@ -2879,6 +2978,7 @@ version = "0.0.0" dependencies = [ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "rls-data 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -2901,6 +3001,9 @@ dependencies = [ "rls-data 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", >>>>>>> Update unstable-crate test >>>>>>> Update unstable-crate test +======= + "rls-data 0.9.0 (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)", "rustc 0.0.0", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2924,18 +3027,7 @@ dependencies = [ >>>>>>> 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)", -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d -======= - "flate 0.0.0", - "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 ->>>>>>> Make html_diff compiles only after stage0 -======= ->>>>>>> Update unstable-crate test "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3015,62 +3107,25 @@ dependencies = [ 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" -======= -<<<<<<< HEAD -<<<<<<< HEAD -version = "0.1.8" -source = "git+https://github.com/rust-lang-nursery/rustfmt?branch=rustfmt-42492#7333dfc95b4af5c7283ba03f33c50f108d2be3f5" -======= -version = "0.1.7" -======= -version = "0.1.8" ->>>>>>> Update unstable check test -source = "registry+https://github.com/rust-lang/crates.io-index" -<<<<<<< HEAD -======= -name = "rustfmt" -version = "0.9.0" -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 -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d ->>>>>>> Make html_diff compiles only after stage0 -======= -======= ->>>>>>> Update unstable-crate test ->>>>>>> Update unstable-crate test -======= -version = "0.1.8" -source = "git+https://github.com/rust-lang-nursery/rustfmt?branch=rustfmt-42492#7333dfc95b4af5c7283ba03f33c50f108d2be3f5" ->>>>>>> Update html-diff-rs dependency dependencies = [ "diff 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -3107,6 +3162,9 @@ dependencies = [ "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 "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)", @@ -3114,6 +3172,7 @@ 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 "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)", @@ -3140,6 +3199,10 @@ dependencies = [ >>>>>>> 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)", + "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)", ] @@ -3157,6 +3220,11 @@ name = "scoped-tls" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "scopeguard" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "selectors" version = "0.18.0" @@ -3172,11 +3240,6 @@ dependencies = [ "smallvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "scopeguard" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "semver" version = "0.7.0" @@ -3195,6 +3258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "serde" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "1.0.11" ======= ======= @@ -3220,6 +3284,9 @@ version = "1.0.9" 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]] @@ -3247,6 +3314,7 @@ 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)", ======= @@ -3279,6 +3347,9 @@ dependencies = [ "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]] @@ -3288,8 +3359,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f "num-traits 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD <<<<<<< HEAD "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -3298,6 +3369,9 @@ dependencies = [ >>>>>>> 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]] @@ -3326,7 +3400,11 @@ 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)", +======= + "libc 0.2.28 (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)", "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3377,7 +3455,7 @@ dependencies = [ "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)", "precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3476,6 +3554,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -3512,6 +3591,9 @@ dependencies = [ "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 "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)", @@ -3534,6 +3616,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -3570,6 +3653,9 @@ dependencies = [ "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 "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)", @@ -3585,6 +3671,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -3621,6 +3708,9 @@ dependencies = [ "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 "xattr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3629,7 +3719,7 @@ name = "tempdir" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3662,6 +3752,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -3698,6 +3789,9 @@ dependencies = [ "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 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3733,6 +3827,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -3787,6 +3882,9 @@ dependencies = [ "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 ] [[package]] @@ -3820,7 +3918,11 @@ dependencies = [ [[package]] name = "toml" +<<<<<<< HEAD version = "0.4.5" +======= +version = "0.4.4" +>>>>>>> Update to last master source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "serde 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3892,15 +3994,7 @@ name = "url" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -======= ->>>>>>> Update unstable-crate test - "idna 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3915,24 +4009,20 @@ 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)", -======= +] + +[[package]] name = "utf-8" version = "0.7.1" 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]] @@ -4004,6 +4094,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", ======= @@ -4040,6 +4131,9 @@ dependencies = [ "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 ] [[package]] @@ -4062,50 +4156,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6" "checksum ar 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b24e4eef8e3fa7e2ca75b157e6039cdf8d9d3a68213ddc19d0fd9d576b9717c9" "checksum atty 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159" -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "checksum backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "72f9b4182546f4b04ebc4ab7f84948953a118bd6021a1b6a6c909e3e94f6be76" -<<<<<<< 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 -======= -======= ->>>>>>> Update unstable-crate test -"checksum backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "72f9b4182546f4b04ebc4ab7f84948953a118bd6021a1b6a6c909e3e94f6be76" -"checksum backtrace-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3a0d842ea781ce92be2bf78a9b38883948542749640b8378b3b2f03d1fd9f1ff" -"checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23" ->>>>>>> Add warnings when rustdoc html rendering differs ->>>>>>> Add warnings when rustdoc html rendering differs -======= -"checksum backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "72f9b4182546f4b04ebc4ab7f84948953a118bd6021a1b6a6c909e3e94f6be76" -"checksum backtrace-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3a0d842ea781ce92be2bf78a9b38883948542749640b8378b3b2f03d1fd9f1ff" ->>>>>>> Update html-diff-rs dependency "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" "checksum bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4" "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" "checksum bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f382711e76b9de6c744cc00d0497baba02fb00a787f088c879f01d09468e32" -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d -<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe "checksum cargo 0.22.0 (git+https://github.com/rust-lang/cargo)" = "" -======= -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> Update unstable-crate test -"checksum cargo 0.21.0 (git+https://github.com/rust-lang/cargo)" = "" ->>>>>>> Add warnings when rustdoc html rendering differs "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "checksum clap 2.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2267a8fdd4dce6956ba6649e130f62fb279026e5e84b92aa939ac8f85ce3f9f0" ======= ======= @@ -4140,12 +4201,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ======= >>>>>>> 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.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6689276ab61f97c660669a5ecc117c36875dfc1ba301c986b16c653415bdf9d7" +"checksum curl 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7034c534a1d7d22f7971d6088aa9d281d219ef724026c3428092500f41ae9c2c" "checksum curl-sys 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d5481162dc4f424d088581db2f979fa7d4c238fe9794595de61d8d7522e277de" +"checksum custom_derive 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" "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" @@ -4162,20 +4228,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "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" "checksum fs2 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866" -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d -"checksum futures 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4b63a4792d4f8f686defe3b39b92127fea6344de5d38202b2ee5a11bbbf29d6a" -"checksum gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)" = "120d07f202dcc3f72859422563522b66fe6463a4c513df062874daad05f85f0a" -======= -"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 -======= ->>>>>>> Update unstable-crate test "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 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" @@ -4185,43 +4239,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum hamcrest 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bf088f042a467089e9baa4972f57f9247e42a0cc549ba264c7a04fbb8ecb89d4" "checksum handlebars 0.26.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fbba80e74e9591a5f6a4ffff6b7f9d645759a896e431cfbdc853e9184370294a" "checksum hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6a22814455d41612f41161581c2883c0c6a1c41852729b17d5ed88f01e153aa" -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f -<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe "checksum home 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9f25ae61099d8f3fee8b483df0bd4ecccf4b2731897aad40d50eca1b641fe6db" -"checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d" -"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 -======= -======= -======= ->>>>>>> Update unstable-crate test -"checksum hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6a22814455d41612f41161581c2883c0c6a1c41852729b17d5ed88f01e153aa" -"checksum html-diff 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8dcd098ed53623fb0f855acab766fced3353a5723314edeb0dad39720f26fed5" -"checksum html5ever 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d60508177ec4e5774a112efcf4d4d5f123cb00a43476fa5940b7da568371a165" -"checksum html5ever-atoms 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c626dc6733babf7110d3a5078b1529e9d0eaaacf6c488ef6a7437b7d515844bb" -======= "checksum html-diff 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "17dbc64943cae56925cf9ff22e8c76ccdb8010f6675a1a56660ec7e597ffa7c7" "checksum html5ever 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a49d5001dd1bddf042ea41ed4e0a671d50b1bf187e66b349d7ec613bdce4ad90" ->>>>>>> Update html-diff-rs dependency -"checksum idna 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2233d4940b1f19f0418c158509cd7396b8d70a5db5705ce410914dc8fa603b37" -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d ->>>>>>> Make html_diff compiles only after stage0 ->>>>>>> Make html_diff compiles only after stage0 -======= ->>>>>>> Update unstable-crate test +"checksum 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 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 <<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f <<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe "checksum languageserver-types 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d52e477b23bf52cd3ca0f9fc6c5d14be954eec97e3b9cdfbd962d911bd533caf" @@ -4281,17 +4308,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ======= >>>>>>> Update html-diff-rs dependency ======= +======= +>>>>>>> Update to last master "checksum kuchiki 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ef2ea4f2f7883cd7c6772b06c14abca01a2cc1f75c426cebffcf6b3b925ef9fc" -"checksum languageserver-types 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "680aee78c75504fdcb172635a7b7da0dccaafa4c42d935e19576c14b27942362" +"checksum 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" -"checksum libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)" = "30885bcb161cf67054244d10d4a7f4835ffd58773bc72e07d35fecf472295503" ->>>>>>> Update html-diff-rs dependency +"checksum libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb7b49972ee23d8aa1026c365a5b440ba08e35075f18c459980c7395c221ec48" "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" "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 magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf0336886480e671965f794bc9b6fce88503563013d1bfb7a502c81fe3ac527" +"checksum magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40d014c7011ac470ae28e2f76a02bfea4a8480f73e701353b49ad7a8d75f4699" "checksum markup5ever 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5050cc22c1d567a9b99bcbe9ffbd8f3127b3d146994105480240dc8ba4f4f2ef" "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376" "checksum mdbook 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "22911d86cde6f80fa9f0fb2a68bbbde85d97af4fe0ce267141c83a4187d28700" @@ -4300,9 +4330,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "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 "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 num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "a311b77ebdc5dd4cf6449d81e4135d9f0e3b153839ac90e648a8ef538f923525" @@ -4312,25 +4345,12 @@ 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" -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d -<<<<<<< HEAD ->>>>>>> Make html_diff compiles only after stage0 -======= ->>>>>>> Update unstable-crate test "checksum num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584" "checksum open 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3478ed1686bd1300c8a981a940abc92b06fac9cbef747f4c668d4e032ff7b842" "checksum openssl 0.9.17 (registry+https://github.com/rust-lang/crates.io-index)" = "085aaedcc89a2fac1eb2bc19cd66f29d4ea99fec60f82a5f3a88a6be7dbd90b5" "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 @@ -4352,6 +4372,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ======= >>>>>>> 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 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" @@ -4370,6 +4393,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "checksum racer 2.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "f120c7510ef7aff254aeb06067fb6fac573ec96a1660e194787cf9dced412bf0" ======= ======= @@ -4392,6 +4416,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "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" @@ -4404,6 +4432,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "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" ======= ======= @@ -4419,10 +4448,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" >>>>>>> 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" -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 "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" ======= ======= @@ -4459,6 +4491,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "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" @@ -4498,6 +4537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum termcolor 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9a5193a56b8d82014662c4b933dea6bec851daf018a2b01722e007daaf5f9dca" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "checksum textwrap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f728584ea33b0ad19318e20557cb0a39097751dbb07171419673502f848c7af6" ======= <<<<<<< HEAD @@ -4532,12 +4572,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ======= "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 "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" @@ -4574,6 +4618,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" >>>>>>> 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 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" @@ -4581,24 +4632,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" "checksum url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb819346883532a271eb626deb43c4a1bb4c4dd47c519bd78137c3e72a4fe27" "checksum url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74e7d099f1ee52f823d4bdd60c93c3602043c728f5db3b97bdb548467f7bddea" -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d -<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe "checksum userenv-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71d28ea36bbd9192d75bd9fa9b39f96ddb986eaee824adae5d53b6e51919b2f3" -======= -<<<<<<< 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" -======= ->>>>>>> Update unstable-crate test -"checksum utf-8 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9aee9ba280438b56d1ebc5329f2094f0ff457f811eeeff0b278d75aa99db400" -======= "checksum utf-8 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b6f923c601c7ac48ef1d66f7d5b5b2d9a7ba9c51333ab75a3ddf8d0309185a56" ->>>>>>> Update html-diff-rs dependency "checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122" "checksum vcpkg 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9e0a7d8bed3178a8fb112199d466eeca9ed09a14ba8ad67718179b4fd5487d0b" diff --git a/src/test/run-make/sysroot-crates-are-unstable/Makefile b/src/test/run-make/sysroot-crates-are-unstable/Makefile index 63fa7e3a0f1..a35174b3c2a 100644 --- a/src/test/run-make/sysroot-crates-are-unstable/Makefile +++ b/src/test/run-make/sysroot-crates-are-unstable/Makefile @@ -1,4 +1,2 @@ -PYTHON=python - all: - python test.py + python2.7 test.py From f2774b7ac3ea9e156b2f37496d4b0de3ca66ec25 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Mon, 31 Jul 2017 23:04:32 +0200 Subject: [PATCH 4/8] Print warning whatever the rendering mode --- src/Cargo.lock | 1205 +++----------------------- src/bootstrap/bin/sccache-plus-cl.rs | 2 +- src/libprofiler_builtins/build.rs | 2 +- src/librustdoc/Cargo.toml | 2 - src/librustdoc/build.rs | 2 +- src/librustdoc/html/render.rs | 39 +- src/librustdoc/lib.rs | 1 - 7 files changed, 139 insertions(+), 1114 deletions(-) diff --git a/src/Cargo.lock b/src/Cargo.lock index 02f5adcc0b1..99aa3b6da23 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -80,62 +80,7 @@ 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 -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 4d5150ce19b0eefca97d213249e34f20036613fe - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= ->>>>>>> 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 -<<<<<<< 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 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -148,10 +93,8 @@ 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 -<<<<<<< HEAD -<<<<<<< HEAD "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)", ======= @@ -194,6 +137,9 @@ dependencies = [ >>>>>>> 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)", ] @@ -203,47 +149,7 @@ 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 -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "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 ] [[package]] @@ -279,8 +185,8 @@ dependencies = [ "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)", "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 "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)", @@ -298,6 +204,8 @@ dependencies = [ ======= "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)", @@ -308,8 +216,12 @@ 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 "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]] @@ -327,11 +239,15 @@ 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]] @@ -345,10 +261,14 @@ dependencies = [ 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 replace = "cargo 0.22.0" [[package]] @@ -378,16 +298,13 @@ dependencies = [ "ignore 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "jobserver 0.1.6 (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)", -======= - "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update to last master - "libgit2-sys 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libgit2-sys 0.6.13 (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.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)", ======= @@ -416,6 +333,9 @@ dependencies = [ ======= "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)", @@ -428,11 +348,15 @@ 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)", ] @@ -454,26 +378,7 @@ dependencies = [ "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 -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 - "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 -<<<<<<< HEAD - "libc 0.2.26 (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 "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)", @@ -542,29 +447,7 @@ dependencies = [ "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)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d ->>>>>>> Update unstable-crate test -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= ->>>>>>> Make html_diff compiles only after stage0 ->>>>>>> Make html_diff compiles only after stage0 -<<<<<<< HEAD ->>>>>>> Make html_diff compiles only after stage0 -======= -======= ->>>>>>> Update unstable-crate test ->>>>>>> Update unstable-crate test -======= - "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update to last master "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)", ] @@ -652,44 +535,9 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "curl-sys 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< HEAD - "curl-sys 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 -======= - "curl-sys 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update unstable-crate test -======= ->>>>>>> Update unstable check test - "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 ->>>>>>> Make html_diff compiles only after stage0 -<<<<<<< HEAD ->>>>>>> Make html_diff compiles only after stage0 -======= -======= - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update html-diff-rs dependency ->>>>>>> Update html-diff-rs dependency -======= - "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update to last master "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)", @@ -706,6 +554,10 @@ dependencies = [ >>>>>>> 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)", ] @@ -715,13 +567,13 @@ version = "0.3.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.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 "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)", @@ -886,55 +738,7 @@ name = "filetime" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "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 -<<<<<<< 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 ] [[package]] @@ -954,47 +758,7 @@ name = "flate2" version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "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 "miniz-sys 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1018,47 +782,7 @@ 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 -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "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 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1092,40 +816,14 @@ 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 -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -======= ->>>>>>> Update unstable-crate test - "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 ->>>>>>> Make html_diff compiles only after stage0 -<<<<<<< HEAD ->>>>>>> Make html_diff compiles only after stage0 -======= -======= - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update html-diff-rs dependency ->>>>>>> Update html-diff-rs dependency -======= - "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update to last master - "libgit2-sys 0.6.12 (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)", ] @@ -1228,7 +926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "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)", - "markup5ever 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "markup5ever 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1295,49 +993,8 @@ name = "jobserver" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "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 - "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update to last master ] [[package]] @@ -1399,65 +1056,22 @@ dependencies = [ [[package]] name = "libc" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD version = "0.2.29" -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 -version = "0.2.27" -======= -<<<<<<< HEAD -<<<<<<< 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 -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d ->>>>>>> Make html_diff compiles only after stage0 -<<<<<<< HEAD ->>>>>>> Make html_diff compiles only after stage0 -======= -======= -======= -version = "0.2.24" ->>>>>>> Update unstable-crate test ->>>>>>> Update unstable-crate test -<<<<<<< HEAD ->>>>>>> Update unstable-crate test -======= -======= -version = "0.2.26" ->>>>>>> Update html-diff-rs dependency ->>>>>>> Update html-diff-rs dependency -======= -version = "0.2.28" ->>>>>>> Update to last master source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libgit2-sys" -version = "0.6.12" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cmake 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "curl-sys 0.3.14 (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)", -======= - "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update to last master "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)", ======= @@ -1484,6 +1098,9 @@ dependencies = [ ======= "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)", ] @@ -1493,10 +1110,8 @@ 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 -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD ======= ======= <<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f @@ -1534,6 +1149,10 @@ dependencies = [ ======= "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)", ] @@ -1543,11 +1162,7 @@ version = "1.0.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)", -<<<<<<< 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 "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)", ] @@ -1568,47 +1183,7 @@ 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 -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "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 ] [[package]] @@ -1635,13 +1210,13 @@ dependencies = [ [[package]] name = "markup5ever" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1684,11 +1259,15 @@ 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]] @@ -1696,47 +1275,7 @@ name = "memchr" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "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 ] [[package]] @@ -1744,47 +1283,7 @@ name = "memchr" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "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 ] [[package]] @@ -1793,47 +1292,7 @@ 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 -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "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 ] [[package]] @@ -1858,47 +1317,7 @@ 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 -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "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 "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)", ] @@ -1974,48 +1393,7 @@ name = "num_cpus" version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD -======= -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 ->>>>>>> Make html_diff compiles only after stage0 -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d ->>>>>>> Make html_diff compiles only after stage0 -<<<<<<< HEAD ->>>>>>> Make html_diff compiles only after stage0 -======= -======= -======= ->>>>>>> Update unstable-crate test ->>>>>>> Update unstable-crate test -<<<<<<< HEAD ->>>>>>> Update unstable-crate test -======= -======= - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update html-diff-rs dependency ->>>>>>> Update html-diff-rs dependency -======= - "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update to last master ] [[package]] @@ -2032,6 +1410,7 @@ name = "openssl" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "0.9.17" ======= ======= @@ -2056,15 +1435,16 @@ version = "0.9.14" ======= 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)", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "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)", ======= @@ -2111,6 +1491,9 @@ dependencies = [ >>>>>>> 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]] @@ -2123,6 +1506,7 @@ name = "openssl-sys" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD version = "0.9.17" ======= ======= @@ -2178,6 +1562,13 @@ dependencies = [ ======= "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)", ] @@ -2381,21 +1772,8 @@ name = "rand" version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 -======= - "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", "magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update to last master ] [[package]] @@ -2460,6 +1838,7 @@ dependencies = [ "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)", @@ -2481,52 +1860,15 @@ dependencies = [ "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-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 -<<<<<<< HEAD -======= ->>>>>>> Update html-diff-rs dependency - "languageserver-types 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "racer 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)", - "rls-analysis 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rls-data 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< e2c9478fe8b57ec12517eccb24b420a9f92293a2 -======= - "languageserver-types 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "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.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 -======= ->>>>>>> Update unstable check test -======= - "racer 2.0.10 (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)", ->>>>>>> Update to last master "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 @@ -2581,8 +1923,12 @@ 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 "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)", ] @@ -2977,33 +2323,7 @@ name = "rustc_save_analysis" version = "0.0.0" dependencies = [ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "rls-data 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 97bfcb5eb0f5284c03eecdb06a0273272564b82d ->>>>>>> Update unstable-crate test -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "rls-data 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< 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 -<<<<<<< HEAD ->>>>>>> Make html_diff compiles only after stage0 -======= -======= - "rls-data 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update unstable-crate test ->>>>>>> Update unstable-crate test -======= - "rls-data 0.9.0 (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)", "rustc 0.0.0", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3017,14 +2337,6 @@ dependencies = [ name = "rustc_trans" version = "0.0.0" dependencies = [ -<<<<<<< HEAD -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> Update unstable-crate test - "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 "flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.51 (registry+https://github.com/rust-lang/crates.io-index)", "jobserver 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3124,47 +2436,7 @@ dependencies = [ "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "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 "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)", @@ -3173,6 +2445,7 @@ dependencies = [ "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)", @@ -3201,6 +2474,9 @@ dependencies = [ >>>>>>> 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)", @@ -3400,11 +2676,7 @@ 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)", -======= - "libc 0.2.28 (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)", "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3448,7 +2720,7 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.6.1" +version = "0.6.2" 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)", @@ -3553,47 +2825,7 @@ name = "syntex_errors" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "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 "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)", @@ -3615,47 +2847,7 @@ 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 -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "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 "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)", @@ -3670,47 +2862,7 @@ 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 -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "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 "xattr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3751,47 +2903,7 @@ 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 -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "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 "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3826,65 +2938,7 @@ 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 -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= ->>>>>>> Update unstable-crate test -<<<<<<< HEAD - "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "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 -======= -<<<<<<< HEAD - "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Make html_diff compiles only after stage0 ->>>>>>> Make html_diff compiles only after stage0 -<<<<<<< HEAD ->>>>>>> Make html_diff compiles only after stage0 -======= -======= ->>>>>>> Update unstable-crate test -======= ->>>>>>> Update unstable check test - "libc 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update unstable-crate test -<<<<<<< HEAD ->>>>>>> Update unstable-crate test -======= -======= - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update html-diff-rs dependency ->>>>>>> Update html-diff-rs dependency -======= - "libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update to last master ] [[package]] @@ -3919,10 +2973,14 @@ 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)", @@ -4093,47 +3151,7 @@ name = "xattr" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", -======= -======= -<<<<<<< 4735b1c7edf0c31073b61bd51db919beceb3313f ->>>>>>> Update html-diff-rs dependency -<<<<<<< 72aaf7b7580c2f6b6e4a12f6d4b1c3a85a30d6c4 - "libc 0.2.27 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "libc 0.2.26 (registry+https://github.com/rust-lang/crates.io-index)", -======= -<<<<<<< HEAD - "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 ] [[package]] @@ -4249,6 +3267,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "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" @@ -4310,19 +3329,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ======= ======= >>>>>>> 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" -"checksum libc 0.2.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb7b49972ee23d8aa1026c365a5b440ba08e35075f18c459980c7395c221ec48" -"checksum libgit2-sys 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "df18a822100352d9863b302faf6f8f25c0e77f0e60feb40e5dbe1238b7f13b1d" +"checksum libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)" = "8a014d9226c2cc402676fbe9ea2e15dd5222cd1dd57f576b5b283178c944a264" +"checksum libgit2-sys 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "0f1641ccb55181967a3e5ee4ae2911c0563492f016383ea67a27886181de088c" "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" -"checksum lzma-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "013fa6506eb7d26040c46dab9ecb7ccb4e2896b5bf24a9d65932501ea9f67af8" +"checksum lzma-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "66b2e318eb97ab84f05725471f90c52a09c964053a5899a13fd0165acc26d00b" "checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" "checksum magenta 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf0336886480e671965f794bc9b6fce88503563013d1bfb7a502c81fe3ac527" "checksum magenta-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40d014c7011ac470ae28e2f76a02bfea4a8480f73e701353b49ad7a8d75f4699" -"checksum markup5ever 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5050cc22c1d567a9b99bcbe9ffbd8f3127b3d146994105480240dc8ba4f4f2ef" +"checksum markup5ever 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff834ac7123c6a37826747e5ca09db41fd7a83126792021c2e636ad174bb77d3" "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376" "checksum mdbook 0.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "22911d86cde6f80fa9f0fb2a68bbbde85d97af4fe0ce267141c83a4187d28700" "checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" @@ -4331,6 +3352,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "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 @@ -4338,6 +3360,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" >>>>>>> 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" @@ -4347,6 +3372,7 @@ 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 @@ -4375,6 +3401,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ======= "checksum openssl-sys 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "ad95f8160d1c150c4f44d4c4959732e048ac046c37f597fe362f8bf57561ffb4" >>>>>>> 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" @@ -4515,10 +3546,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ======= "checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537" "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.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2fa69b90c5398217fb0414706d1becea9325ad21ed5d87bd6dda82127911f324" +"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" "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" @@ -4582,6 +3617,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" <<<<<<< 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" @@ -4620,6 +3656,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" >>>>>>> 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" diff --git a/src/bootstrap/bin/sccache-plus-cl.rs b/src/bootstrap/bin/sccache-plus-cl.rs index cf0c1274923..5684a565a9c 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::Config::new(); + let mut cfg = gcc::Build::new(); cfg.cargo_metadata(false) .out_dir("/") .target(&target) diff --git a/src/libprofiler_builtins/build.rs b/src/libprofiler_builtins/build.rs index 55df14ea215..41e92b33475 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::Config::new(); + let cfg = &mut gcc::Build::new(); let mut profile_sources = vec!["GCDAProfiling.c", "InstrProfiling.c", diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml index 96fdf6dfa55..08359bc3f19 100644 --- a/src/librustdoc/Cargo.toml +++ b/src/librustdoc/Cargo.toml @@ -12,8 +12,6 @@ path = "lib.rs" env_logger = { version = "0.4", default-features = false } log = "0.3" pulldown-cmark = { version = "0.0.14", default-features = false } - -[target.'cfg(not(any(stage0, stage1)))'.dependencies] html-diff = "0.0.3" [build-dependencies] diff --git a/src/librustdoc/build.rs b/src/librustdoc/build.rs index 4189e3d2ac7..130c6fd01a8 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::Config::new(); + let mut cfg = gcc::Build::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 ae4f75efd5a..900fcad7794 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -75,7 +75,6 @@ use html::item_type::ItemType; use html::markdown::{self, Markdown, MarkdownHtml, MarkdownSummaryLine, RenderType}; use html::{highlight, layout}; -#[cfg(not(any(stage0, stage1)))] use html_diff; /// A pair of name and its optional document. @@ -1648,33 +1647,23 @@ fn document(w: &mut fmt::Formatter, cx: &Context, item: &clean::Item) -> fmt::Re Ok(()) } -#[cfg(not(any(stage0, stage1)))] fn get_html_diff(w: &mut fmt::Formatter, md_text: &str, render_type: RenderType, prefix: &str) -> fmt::Result { - if render_type == RenderType::Pulldown { - 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::>() - .join("\n")); - } - write!(w, "
{}{}
", prefix, output) - } else { - write!(w, "
{}{}
", - prefix, - Markdown(md_text, render_type)) + let output = format!("{}", Markdown(md_text, render_type)); + let old = format!("{}", Markdown(md_text, match render_type { + RenderType::Hoedown => RenderType::Pulldown, + RenderType::Pulldown => 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::>() + .join("\n")); } -} - -#[cfg(any(stage0, stage1))] -fn get_html_diff(w: &mut fmt::Formatter, md_text: &str, render_type: RenderType, - prefix: &str) -> fmt::Result { - write!(w, "
{}{}
", prefix, Markdown(md_text, render_type)) + write!(w, "
{}{}
", prefix, output) } fn document_short(w: &mut fmt::Formatter, item: &clean::Item, link: AssocItemLink, diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index cc7893c227c..d04b6d3417a 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -28,7 +28,6 @@ extern crate arena; extern crate getopts; extern crate env_logger; -#[cfg(not(any(stage0, stage1)))] extern crate html_diff; extern crate libc; extern crate rustc; From bba7fd9dd54937719a6e88c954db7ab2ea5a3541 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 27 Aug 2017 14:47:35 +0200 Subject: [PATCH 5/8] Temporary fix for a test (will require another update when this is fully merged) --- src/libstd/io/mod.rs | 2 +- src/test/rustdoc/issue-29449.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 074ab3ebd8f..181b8726e48 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -212,7 +212,7 @@ //! # } //! ``` //! -//! [functions-list]: #functions-1 +//! [functions-list]: #functions-2 //! //! ## io::Result //! diff --git a/src/test/rustdoc/issue-29449.rs b/src/test/rustdoc/issue-29449.rs index f296048e30b..29b89d68970 100644 --- a/src/test/rustdoc/issue-29449.rs +++ b/src/test/rustdoc/issue-29449.rs @@ -18,12 +18,12 @@ impl Foo { /// # Panics pub fn bar() {} - // @has - '//*[@id="examples-1"]//a' 'Examples' + // @has - '//*[@id="examples-2"]//a' 'Examples' /// # Examples pub fn bar_1() {} - // @has - '//*[@id="examples-2"]//a' 'Examples' - // @has - '//*[@id="panics-1"]//a' 'Panics' + // @has - '//*[@id="examples-4"]//a' 'Examples' + // @has - '//*[@id="panics-2"]//a' 'Panics' /// # Examples /// # Panics pub fn bar_2() {} From 9b26f3ad25bc9603ace18931eada23438f3b64d7 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 27 Aug 2017 12:40:56 +0200 Subject: [PATCH 6/8] Remove some false positive issues --- src/Cargo.lock | 1089 +------------------------- src/bootstrap/bin/sccache-plus-cl.rs | 2 +- src/libprofiler_builtins/build.rs | 2 +- src/librustdoc/build.rs | 2 +- src/librustdoc/html/render.rs | 10 +- 5 files changed, 24 insertions(+), 1081 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,48 +2449,11 @@ 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)" = "" "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 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)" = "" -"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 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" "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" @@ -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)" = "" -======= -"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)" = "" -"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::>() .join("\n")); } From 76e32210d18bffa25e9d82d8c589031fca23da05 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 30 Aug 2017 20:07:58 +0200 Subject: [PATCH 7/8] Add license exceptions --- src/tools/tidy/src/deps.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index f572ad9cd02..e9e4b55402c 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -33,6 +33,12 @@ static EXCEPTIONS: &'static [&'static str] = &[ "openssl", // BSD+advertising clause, cargo, mdbook "pest", // MPL2, mdbook via handlebars "thread-id", // Apache-2.0, mdbook + "cssparser", // MPL-2.0, rustdoc + "smallvec", // MPL-2.0, rustdoc + "magenta-sys", // BSD-3-Clause, rustdoc + "magenta", // BSD-3-Clause, rustdoc + "cssparser-macros", // MPL-2.0, rustdoc + "selectors", // MPL-2.0, rustdoc ]; pub fn check(path: &Path, bad: &mut bool) { From b501d000907963aa33d65a864f684de0de4167e6 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Thu, 31 Aug 2017 09:49:38 +0200 Subject: [PATCH 8/8] downgrade libgit2 --- src/Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Cargo.lock b/src/Cargo.lock index 607ca6be57b..c22c133df22 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -207,7 +207,7 @@ dependencies = [ "jobserver 0.1.6 (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)", - "libgit2-sys 0.6.13 (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.6.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -598,7 +598,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "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)", + "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)", @@ -838,7 +838,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libgit2-sys" -version = "0.6.13" +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)", @@ -2500,7 +2500,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "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" "checksum libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)" = "8a014d9226c2cc402676fbe9ea2e15dd5222cd1dd57f576b5b283178c944a264" -"checksum libgit2-sys 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "0f1641ccb55181967a3e5ee4ae2911c0563492f016383ea67a27886181de088c" +"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"