diff options
| author | bors <bors@rust-lang.org> | 2019-12-29 16:12:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-29 16:12:57 +0000 |
| commit | 25434f898b499876203a3b95c1b38bad5ed2cc5d (patch) | |
| tree | ccddb32abd911cffe2733601ec87ffed259d5bb3 | |
| parent | e0239b4bd00cdc74a95caa7440bec6f9a2e7e300 (diff) | |
| parent | f541e91a7a355be27f16e2227deb04c39a26fc63 (diff) | |
| download | rust-25434f898b499876203a3b95c1b38bad5ed2cc5d.tar.gz rust-25434f898b499876203a3b95c1b38bad5ed2cc5d.zip | |
Auto merge of #67661 - JohnTitor:clippy-cargo, r=oli-obk
Update Clippy and cargo includes latest rustup and resolves dependency conflicts with cargo Closes #67541 r? @oli-obk @Manishearth
| -rw-r--r-- | Cargo.lock | 14 | ||||
| m--------- | src/tools/cargo | 0 | ||||
| m--------- | src/tools/clippy | 15 |
3 files changed, 14 insertions, 15 deletions
diff --git a/Cargo.lock b/Cargo.lock index 847a406985d..b90bcfc7f2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -275,7 +275,7 @@ dependencies = [ [[package]] name = "cargo" -version = "0.42.0" +version = "0.43.0" dependencies = [ "atty", "bytesize", @@ -1249,9 +1249,9 @@ dependencies = [ [[package]] name = "git2" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f27186fbb5ec67ece9a56990292bc5aed3c3fc51b9b07b0b52446b1dfb4a82" +checksum = "77519ef7c5beee314d0804d4534f01e0f9e8d9acdee2b7a48627e590b27e0ec4" dependencies = [ "bitflags", "libc", @@ -1264,9 +1264,9 @@ dependencies = [ [[package]] name = "git2-curl" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6527e480187ce19aaf4fa6acfb7657b25628ce31cb8ffabdfca3bf731524c5" +checksum = "d2559abb1d87d27668d31bd868a000f0e2e0065d10e78961b62da95d7a7f1cc7" dependencies = [ "curl", "git2", @@ -1782,9 +1782,9 @@ dependencies = [ [[package]] name = "libgit2-sys" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a30f8637eb59616ee3b8a00f6adff781ee4ddd8343a615b8238de756060cc1b3" +checksum = "d9ec6bca50549d34a392611dde775123086acbd994e3fff64954777ce2dc2e51" dependencies = [ "cc", "libc", diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 19a0de242f442ac7149c511031599aafa35b36d +Subproject 86134e7666a088682f20b76278c3ee096a31521 diff --git a/src/tools/clippy b/src/tools/clippy -Subproject cfb332005845883f2abb50fe183fc91221bad9d +Subproject c807fbc8ba41432388b6f590668ba81314c07c3 |