diff options
| author | bors <bors@rust-lang.org> | 2022-05-25 20:35:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-25 20:35:49 +0000 |
| commit | 4cbaac699c14b7ac7cc80e54823b2ef6afeb64af (patch) | |
| tree | 4d70b6e37394ba83cca52206755f5f91d4378771 | |
| parent | 1b5e1215efa47cf4d78a945c7be1c04cda4f57d4 (diff) | |
| parent | 6b48b52a6786b10efb76d90866cc1cffc16d0410 (diff) | |
| download | rust-4cbaac699c14b7ac7cc80e54823b2ef6afeb64af.tar.gz rust-4cbaac699c14b7ac7cc80e54823b2ef6afeb64af.zip | |
Auto merge of #97403 - arlosi:update-cargo, r=ehuss
Update cargo 10 commits in a4c1cd0eb6b18082a7e693f5a665548fe1534be4..39ad1039d9e3e1746177bf5d134af4c164f95528 2022-05-20 00:55:25 +0000 to 2022-05-25 00:50:02 +0000 * doc: discuss build script instruction order (rust-lang/cargo#10600) * Require http-registry URLs to end with a '/' (rust-lang/cargo#10698) * No printing executable names when running tests and benchmarks with json message format (rust-lang/cargo#10691) * Restore proper error for crate not in local reg (rust-lang/cargo#10683) * Update libcurl (rust-lang/cargo#10696) * Fixed small typos (rust-lang/cargo#10693) * fix bugs with `workspace` key and `update_toml` (rust-lang/cargo#10685) * Bump to 0.64.0, update changelog (rust-lang/cargo#10687) * List C compiler as a build dependency in README (rust-lang/cargo#10678) * Add unstable `rustc-check-cfg` build script output (rust-lang/cargo#10539) r? `@ehuss`
| -rw-r--r-- | Cargo.lock | 10 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock index f9f8362fb7e..7154061f4b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -311,7 +311,7 @@ dependencies = [ [[package]] name = "cargo" -version = "0.63.0" +version = "0.64.0" dependencies = [ "anyhow", "atty", @@ -970,9 +970,9 @@ dependencies = [ [[package]] name = "curl" -version = "0.4.41" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc6d233563261f8db6ffb83bbaad5a73837a6e6b28868e926337ebbdece0be3" +checksum = "37d855aeef205b43f65a5001e0997d81f8efca7badad4fad7d897aa7f0d0651f" dependencies = [ "curl-sys", "libc", @@ -985,9 +985,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.51+curl-7.80.0" +version = "0.4.55+curl-7.83.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d130987e6a6a34fe0889e1083022fa48cd90e6709a84be3fb8dd95801de5af20" +checksum = "23734ec77368ec583c2e61dd3f0b0e5c98b93abe6d2a004ca06b91dd7e3e2762" dependencies = [ "cc", "libc", diff --git a/src/tools/cargo b/src/tools/cargo -Subproject a4c1cd0eb6b18082a7e693f5a665548fe1534be +Subproject 39ad1039d9e3e1746177bf5d134af4c164f9552 |