diff options
| author | bors <bors@rust-lang.org> | 2023-03-01 00:20:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-01 00:20:01 +0000 |
| commit | ca1bc7f1f6487991dd6b504d1fddbc982e6b779c (patch) | |
| tree | 82b3bbc7c6e3652be00b72b9903ec181dabd133d | |
| parent | 31f858d9a511f24fedb8ed997b28304fec809630 (diff) | |
| parent | 741f1afdd5b25fc5d91ec4206763263225884be7 (diff) | |
| download | rust-ca1bc7f1f6487991dd6b504d1fddbc982e6b779c.tar.gz rust-ca1bc7f1f6487991dd6b504d1fddbc982e6b779c.zip | |
Auto merge of #108582 - weihanglo:update-cargo, r=weihanglo
Update cargo 10 commits in 9d5b32f503fc099c4064298465add14d4bce11e6..9880b408a3af50c08fab3dbf4aa2a972df71e951 2023-02-22 23:04:16 +0000 to 2023-02-28 19:39:39 +0000 - bump jobserver to respect `--jobserver-auth=fifo:PATH` (rust-lang/cargo#11767) - Addition of support for -F as an alias for --features (rust-lang/cargo#11774) - Added documentation for the configuration discovery of `cargo install` to the man pages (rust-lang/cargo#11763) - Fix Cargo removing the sparse+ prefix from sparse URLs in .crates.toml (rust-lang/cargo#11756) - Fix warning with tempfile (rust-lang/cargo#11771) - Error message for transitive artifact dependencies with targets the package doesn't directly interact with (rust-lang/cargo#11643) - Fix tests with nondeterministic ordering (rust-lang/cargo#11766) - Make some blocking tests non-blocking (rust-lang/cargo#11650) - Suggest cargo add when installing library crate (rust-lang/cargo#11410) - chore: bump is-terminal to 0.4.4 (rust-lang/cargo#11759) r? `@ghost`
| -rw-r--r-- | Cargo.lock | 21 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 6 insertions, 15 deletions
diff --git a/Cargo.lock b/Cargo.lock index c4704fb0dd5..bff657b35fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1924,15 +1924,6 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "856b5cb0902c2b6d65d5fd97dfa30f9b70c7538e770b98eab5ed52d8db923e01" @@ -2222,14 +2213,14 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.0", "io-lifetimes", "rustix", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -2260,9 +2251,9 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 9d5b32f503fc099c4064298465add14d4bce11e +Subproject 9880b408a3af50c08fab3dbf4aa2a972df71e95 |