diff options
| author | bors <bors@rust-lang.org> | 2022-10-22 16:26:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-22 16:26:31 +0000 |
| commit | 5a0f454c021d9617c6c37ed2f703bf4a8f41c410 (patch) | |
| tree | 77b559f65617adea26b409a134b6b78625a54909 | |
| parent | 289b2b8cf971b1adf132cb5b7f15368837c5e353 (diff) | |
| parent | 9926f6e4274af539b8961e7d6115021171766db6 (diff) | |
Auto merge of #103400 - weihanglo:update-cargo, r=weihanglo
Update cargo 5 commits in 3ff044334f0567ce1481c78603aeee7211b91623..071eeaf210708219a5a1b2c4728ca2f97df7f2ae 2022-10-17 20:25:00 +0000 to 2022-10-22 01:17:55 +0000 - fix: Remove leading newline in vendor output (rust-lang/cargo#11273) - Fix publishing with a dependency on a sparse registry (rust-lang/cargo#11268) - Add missing edition (rust-lang/cargo#11265) - fix(publish): Check remote git registry more than once post-publish (rust-lang/cargo#11255) - Fix typo (rust-lang/cargo#11258) r? `@ghost`
| -rw-r--r-- | Cargo.lock | 26 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 18 insertions, 8 deletions
diff --git a/Cargo.lock b/Cargo.lock index 34d7f606645..3e1c904e337 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1843,9 +1843,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.1" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] @@ -4475,9 +4475,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.143" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" dependencies = [ "serde_derive", ] @@ -4494,9 +4494,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.143" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" dependencies = [ "proc-macro2", "quote", @@ -4980,16 +4980,26 @@ dependencies = [ ] [[package]] +name = "toml_datetime" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808b51e57d0ef8f71115d8f3a01e7d3750d01c79cac4b3eda910f4389fdf92fd" +dependencies = [ + "serde", +] + +[[package]] name = "toml_edit" -version = "0.14.3" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba98375fd631b83696f87c64e4ed8e29e6a1f3404d6aed95fa95163bad38e705" +checksum = "b1541ba70885967e662f69d31ab3aeca7b1aaecfcd58679590b893e9239c3646" dependencies = [ "combine", "indexmap", "itertools", "kstring", "serde", + "toml_datetime", ] [[package]] diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 3ff044334f0567ce1481c78603aeee7211b9162 +Subproject 071eeaf210708219a5a1b2c4728ca2f97df7f2a |