diff options
| author | bors <bors@rust-lang.org> | 2022-12-19 03:36:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-19 03:36:34 +0000 |
| commit | 224fa3907e319405fdabdb06c33f99b896754773 (patch) | |
| tree | aa9d164ee52a2f04eb1d846f69918f2cc700d5ea | |
| parent | a474ebbc4e975683a296739bd9b11b5dde83f808 (diff) | |
| parent | 4ab78da50e494d16fc386b865951dbf9db5c68be (diff) | |
| download | rust-224fa3907e319405fdabdb06c33f99b896754773.tar.gz rust-224fa3907e319405fdabdb06c33f99b896754773.zip | |
Auto merge of #105884 - weihanglo:update-cargo, r=weihanglo
Update cargo 11 commits in cc0a320879c17207bbfb96b5d778e28a2c62030d..c994a4a638370bc7e0ffcbb0e2865afdfa7d4415 2022-12-14 14:46:57 +0000 to 2022-12-18 21:50:58 +0000 - Fix examples of proc-macro crates being scraped for examples (rust-lang/cargo#11497) - Enable triagebot's relabel functionality (rust-lang/cargo#11498) - Revert "temporarily disable test `lto::test_profile`" (rust-lang/cargo#11495) - Bump to 0.69.0, update changelog (rust-lang/cargo#11493) - Fix typo (rust-lang/cargo#11491) - Display CPU info in CI (rust-lang/cargo#11488) - Fix collision_doc_profile test error (rust-lang/cargo#11489) - fix: Make auto-fix note work with `clippy` (rust-lang/cargo#11399) - fix(add): use the possessive in error message (rust-lang/cargo#11483) - Document home crate in contrib docs (rust-lang/cargo#11481) - Split up registry documentation into multiple sections (rust-lang/cargo#11480) r? `@ghost`
| -rw-r--r-- | Cargo.lock | 4 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock index cce203ef728..1d9a9240ccf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -294,7 +294,7 @@ dependencies = [ [[package]] name = "cargo" -version = "0.68.0" +version = "0.69.0" dependencies = [ "anyhow", "bytesize", @@ -5407,7 +5407,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "rand 0.8.5", "static_assertions", ] diff --git a/src/tools/cargo b/src/tools/cargo -Subproject cc0a320879c17207bbfb96b5d778e28a2c62030 +Subproject c994a4a638370bc7e0ffcbb0e2865afdfa7d441 |