Commit c1dba09
committed
Auto merge of rust-lang#126005 - weihanglo:update-cargo, r=weihanglo
Update cargo
9 commits in 7a6fad0984d28c8330974636972aa296b67c4513..34a6a87d8a2330d8c9d578f927489689328a652d
2024-05-31 22:26:03 +0000 to 2024-06-04 15:31:01 +0000
- Silence the warning about forgetting the vendoring (rust-lang/cargo#13886)
- fix(vendor): Ensure sort happens for vendor (rust-lang/cargo#14004)
- fix(add): Avoid escaping double-quotes by using string literals (rust-lang/cargo#14006)
- refactor(source): Split `RecursivePathSource` out of `PathSource` (rust-lang/cargo#13993)
- doc: Add README for resolver-tests (rust-lang/cargo#13977)
- Allows the default git/gitoxide configuration to be obtained from the ENV and config (rust-lang/cargo#13687)
- refactor: Transition direct assertions from cargo-test-support to snapbox (rust-lang/cargo#13980)
- Fix: Skip deserialization of unrelated fields with overlapping name (rust-lang/cargo#14000)
- chore(deps): update alpine docker tag to v3.20 (rust-lang/cargo#13996)
r? ghost1 file changed
+1
-1
lines changed- Cargo.lock+10-10
- Cargo.toml+3-3
- crates/cargo-test-support/containers/sshd/Dockerfile+1-1
- crates/cargo-test-support/src/compare.rs+142-71
- crates/cargo-test-support/src/lib.rs+1
- crates/resolver-tests/README.md+13
- crates/resolver-tests/src/lib.rs+12-1
- src/cargo/core/features.rs+130-8
- src/cargo/core/workspace.rs+1-2
- src/cargo/ops/resolve.rs+2-2
- src/cargo/sources/git/source.rs+4-4
- src/cargo/sources/mod.rs+1
- src/cargo/sources/path.rs+763-592
- src/cargo/sources/replaced.rs+1-1
- src/cargo/sources/source.rs+2
- src/cargo/util/context/de.rs+15-1
- src/cargo/util/toml/mod.rs-5
- src/cargo/util/toml/targets.rs+8-2
- tests/testsuite/alt_registry.rs+9-5
- tests/testsuite/artifact_dep.rs+56-31
- tests/testsuite/bad_config.rs+4-4
- tests/testsuite/build.rs+13-10
- tests/testsuite/build_script.rs+16-15
- tests/testsuite/cargo_add/target_cfg/mod.rs+1-1
- tests/testsuite/cargo_add/target_cfg/out/Cargo.toml+1-1
- tests/testsuite/cargo_add/target_cfg/stderr.term.svg+3-3
- tests/testsuite/cargo_config/mod.rs+4-4
- tests/testsuite/check.rs+6-2
- tests/testsuite/config.rs+252-21
- tests/testsuite/config_cli.rs+7-5
- tests/testsuite/config_include.rs+1-2
- tests/testsuite/dep_info.rs+7-3
- tests/testsuite/fix.rs+4-3
- tests/testsuite/install.rs+31-33
- tests/testsuite/lockfile_compat.rs+43-35
- tests/testsuite/package.rs+125-2
- tests/testsuite/pkgid.rs+3-2
- tests/testsuite/profile_trim_paths.rs+14-10
- tests/testsuite/registry.rs+40
- tests/testsuite/registry_auth.rs+10-18
- tests/testsuite/required_features.rs+1-1
- tests/testsuite/vendor.rs+127
0 commit comments