From cf9aafe5918ff2c0163510a20eaa6c6b1f2c108c Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Tue, 31 Jan 2023 08:33:06 +0000 Subject: [PATCH] [beta] Update cargo 1 commits in 985d561f0bb9b76ec043a2b12511790ec7a2b954..0762e3bbdb6fa64b6859154199ec47d6c90c731c 2023-01-20 14:39:28 +0000 to 2023-01-30 22:07:51 +0000 - [beta-1.68] Backport fixes of split-debuginfo detection (rust-lang/cargo#11649) --- Cargo.lock | 22 +++++++++++----------- src/tools/cargo | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cc1b5dcf6a76e..4d74709f54b00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -351,7 +351,7 @@ dependencies = [ "cargo-test-macro", "cargo-test-support", "cargo-util", - "clap 4.1.1", + "clap 4.1.4", "crates-io", "curl", "curl-sys", @@ -655,9 +655,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.1" +version = "4.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2" +checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" dependencies = [ "bitflags", "clap_derive 4.1.0", @@ -675,7 +675,7 @@ version = "4.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10861370d2ba66b0f5989f83ebf35db6421713fd92351790e7fdd6c36774c56b" dependencies = [ - "clap 4.1.1", + "clap 4.1.4", ] [[package]] @@ -1799,9 +1799,9 @@ dependencies = [ [[package]] name = "git2" -version = "0.16.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" +checksum = "be36bc9e0546df253c0cc41fd0af34f5e92845ad8509462ec76672fac6997f5b" dependencies = [ "bitflags", "libc", @@ -2294,7 +2294,7 @@ name = "jsondoclint" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.1.1", + "clap 4.1.4", "fs-err", "rustdoc-json-types", "serde", @@ -2365,9 +2365,9 @@ dependencies = [ [[package]] name = "libgit2-sys" -version = "0.14.2+1.5.1" +version = "0.14.1+1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +checksum = "4a07fb2692bc3593bda59de45a502bb3071659f2c515e28c71e728306b038e17" dependencies = [ "cc", "libc", @@ -2557,7 +2557,7 @@ dependencies = [ "ammonia", "anyhow", "chrono", - "clap 4.1.1", + "clap 4.1.4", "clap_complete", "elasticlunr-rs", "env_logger 0.10.0", @@ -3528,7 +3528,7 @@ dependencies = [ name = "rustbook" version = "0.1.0" dependencies = [ - "clap 4.1.1", + "clap 4.1.4", "env_logger 0.7.1", "mdbook", ] diff --git a/src/tools/cargo b/src/tools/cargo index 985d561f0bb9b..0762e3bbdb6fa 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit 985d561f0bb9b76ec043a2b12511790ec7a2b954 +Subproject commit 0762e3bbdb6fa64b6859154199ec47d6c90c731c