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)
weihanglo · Dec 18, 2022 · 4ab78da · 4ab78da
1 parent d0dc9ef
commit 4ab78da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
+88 −3		CHANGELOG.md
+1 −1		Cargo.toml
+9 −0		ci/dump-environment.sh
+1 −1		crates/resolver-tests/src/lib.rs
+1 −1		src/bin/cargo/commands/add.rs
+24 −6		src/cargo/core/compiler/job_queue.rs
+1 −1		src/cargo/core/workspace.rs
+9 −13		src/cargo/ops/cargo_compile/mod.rs
+4 −0		src/doc/contrib/src/architecture/codebase.md
+3 −0		src/doc/src/SUMMARY.md
+31 −570		src/doc/src/reference/registries.md
+205 −0		src/doc/src/reference/registry-index.md
+354 −0		src/doc/src/reference/registry-web-api.md
+20 −0		src/doc/src/reference/running-a-registry.md
+1 −1		tests/testsuite/cargo_add/multiple_conflicts_with_features/stderr.log
+47 −0		tests/testsuite/check.rs
+3 −1		tests/testsuite/collisions.rs
+24 −0		tests/testsuite/docscrape.rs
+0 −4		tests/testsuite/lto.rs
+14 −0		triagebot.toml