Skip to content

Commit

Permalink
Auto merge of rust-lang#101909 - weihanglo:update-cargo, r=ehuss
Browse files Browse the repository at this point in the history 
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)
  • Loading branch information
@bors
bors committed Sep 19, 2022
2 parents 2019147 + 6d02f78 commit a57a6ac
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 19 files
+2 −2 CHANGELOG.md
+49 −7 crates/cargo-test-support/src/registry.rs
+1 −1 src/bin/cargo/commands/add.rs
+9 −6 src/cargo/core/resolver/resolve.rs
+1 −1 src/cargo/ops/cargo_add/crate_spec.rs
+8 −11 src/cargo/ops/cargo_add/mod.rs
+29 −6 src/cargo/sources/registry/mod.rs
+51 −0 src/cargo/util/io.rs
+3 −0 src/cargo/util/mod.rs
+70 −65 src/cargo/util/toml_mut/dependency.rs
+22 −19 src/cargo/util/toml_mut/manifest.rs
+13 −0 src/cargo/util/toml_mut/mod.rs
+2 −2 src/doc/src/reference/manifest.md
+8 −0 src/doc/src/reference/overriding-dependencies.md
+1 −1 src/doc/src/reference/resolver.md
+1 −1 src/doc/src/reference/specifying-dependencies.md
+3 −3 src/doc/src/reference/unstable.md
+99 −55 src/doc/src/reference/workspaces.md
+85 −0 tests/testsuite/registry.rs

0 comments on commit a57a6ac

Please sign in to comment.