Skip to content

Commit

Permalink
Auto merge of rust-lang#131910 - weihanglo:update-cargo, r=weihanglo
Browse files Browse the repository at this point in the history 
Update cargo

7 commits in 8c30ce53688e25f7e9d860b33cc914fb2957ca9a..cf53cc54bb593b5ec3dc2be4b1702f50c36d24d5
2024-10-15 16:43:16 +0000 to 2024-10-18 13:56:15 +0000
- feat: Stabilize MSRV-aware resolver config (rust-lang/cargo#14639)
- Help with `[patch.crates.io]` (rust-lang/cargo#14700)
- test: Migrate publish snapshotting to snapbox (rust-lang/cargo#14642)
- Bump to 0.85.0; update changelog (rust-lang/cargo#14695)
- Fix typo in faq.md (rust-lang/cargo#14696)
- fix(registry): `HttpRegistry` `block_until_ready` returns early when work is still pending (rust-lang/cargo#14694)
- fix(resolver): avoid cloning when iterating using RcVecIter (rust-lang/cargo#14690)
  • Loading branch information
@bors
bors committed Oct 19, 2024
2 parents e92993d + e541058 commit b27f33a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 40 files
+200 −18 CHANGELOG.md
+2 −2 Cargo.lock
+2 −2 Cargo.toml
+1 −1 crates/cargo-test-support/Cargo.toml
+142 −40 crates/cargo-test-support/src/compare.rs
+0 −117 crates/cargo-test-support/src/diff.rs
+58 −40 crates/cargo-test-support/src/publish.rs
+1 −11 src/bin/cargo/commands/generate_lockfile.rs
+1 −12 src/bin/cargo/commands/update.rs
+10 −10 src/cargo/core/resolver/mod.rs
+22 −35 src/cargo/core/resolver/types.rs
+6 −25 src/cargo/core/workspace.rs
+9 −6 src/cargo/sources/registry/http_remote.rs
+7 −2 src/cargo/util/toml/mod.rs
+1 −1 src/doc/src/faq.md
+27 −0 src/doc/src/reference/config.md
+85 −1 src/doc/src/reference/resolver.md
+6 −0 src/doc/src/reference/rust-version.md
+1 −25 src/doc/src/reference/unstable.md
+16 −6 tests/testsuite/artifact_dep.rs
+0 −2 tests/testsuite/cargo_add/rust_version_ignore/mod.rs
+0 −2 tests/testsuite/cargo_add/rust_version_incompatible/mod.rs
+0 −2 tests/testsuite/cargo_add/rust_version_latest/mod.rs
+0 −2 tests/testsuite/cargo_add/rust_version_older/mod.rs
+0 −2 tests/testsuite/cargo_add/rustc_ignore/mod.rs
+0 −2 tests/testsuite/cargo_add/rustc_incompatible/mod.rs
+0 −2 tests/testsuite/cargo_add/rustc_latest/mod.rs
+0 −2 tests/testsuite/cargo_add/rustc_older/mod.rs
+1 −1 tests/testsuite/cargo_generate_lockfile/help/stdout.term.svg
+1 −1 tests/testsuite/cargo_update/help/stdout.term.svg
+1 −1 tests/testsuite/cross_publish.rs
+15 −6 tests/testsuite/features2.rs
+30 −12 tests/testsuite/features_namespaced.rs
+75 −30 tests/testsuite/inheritable_workspace_fields.rs
+234 −133 tests/testsuite/package.rs
+71 −51 tests/testsuite/publish.rs
+5 −5 tests/testsuite/publish_lockfile.rs
+60 −0 tests/testsuite/registry.rs
+0 −151 tests/testsuite/rust_version.rs
+15 −6 tests/testsuite/weak_dep_features.rs

0 comments on commit b27f33a

Please sign in to comment.