Commit a57a6ac
committed
Auto merge of rust-lang#101909 - weihanglo:update-cargo, r=ehuss
Update cargo (CVE fixes included)
8 commits in 082503982ea0fb7a8fd72210427d43a2e2128a63..73ba3f35e0205844418260722c11602113179c4a
2022-09-13 17:49:38 +0000 to 2022-09-18 06:38:16 +0000
- Revert "Clarify when cargo detects changes" (rust-lang/cargo#11107)
- Fix links to workspace inheritance headings in workspace docs (rust-lang/cargo#11103)
- docs(ref): Clarify workspace settings (rust-lang/cargo#11082)
- Update comment about ResolveVersion default version (rust-lang/cargo#11095)
- [master] Run `reach_max_unpack_size` test only on debug build (rust-lang/cargo#11091)
- Clarify when cargo detects changes (rust-lang/cargo#11092)
- [master] Fix for GHSA-rfj2-q3h3-hm5j and GHSA-2hvr-h6gw-qrxp (rust-lang/cargo#11089)
- Expose cargo add internals as edit API (rust-lang/cargo#11059)1 file changed
+1
-1
lines changed- CHANGELOG.md+2-2
- crates/cargo-test-support/src/registry.rs+49-7
- src/bin/cargo/commands/add.rs+1-1
- src/cargo/core/resolver/resolve.rs+9-6
- src/cargo/ops/cargo_add/crate_spec.rs+1-1
- src/cargo/ops/cargo_add/mod.rs+8-11
- src/cargo/sources/registry/mod.rs+29-6
- src/cargo/util/io.rs+51
- src/cargo/util/mod.rs+3
- src/cargo/util/toml_mut/dependency.rs+70-65
- src/cargo/util/toml_mut/manifest.rs+22-19
- src/cargo/util/toml_mut/mod.rs+13
- src/doc/src/reference/manifest.md+2-2
- src/doc/src/reference/overriding-dependencies.md+8
- src/doc/src/reference/resolver.md+1-1
- src/doc/src/reference/specifying-dependencies.md+1-1
- src/doc/src/reference/unstable.md+3-3
- src/doc/src/reference/workspaces.md+99-55
- tests/testsuite/registry.rs+85
0 commit comments