Commit 6dca348
committed
Auto merge of #153429 - weihanglo:update-cargo, r=weihanglo
Update cargo submodule
12 commits in f298b8c82da0cba538516b45b04a480fc501d4c0..90ed291a50efc459e0c380d7b455777ed41c6799
2026-02-24 21:59:20 +0000 to 2026-03-05 15:11:25 +0000
- test(git): Mark a test as non-deterministic (rust-lang/cargo#16706)
- Docs: Clarify build script current directory (rust-lang/cargo#16703)
- test(replace): Mark a test as non-deterministic (rust-lang/cargo#16700)
- chore: bump to 0.97.0; update changelog (rust-lang/cargo#16699)
- fix(tests): allow for 'could not' as well as couldn't in test output (rust-lang/cargo#16698)
- chore: Upgrade dependencies (rust-lang/cargo#16690)
- chore(deps): update crate-ci/typos action to v1.44.0 (rust-lang/cargo#16685)
- feat(help): display manpage for nested commands (rust-lang/cargo#16432)
- feat: improve parent workspace search error msg (rust-lang/cargo#16669)
- feat(fix): Inject an edition into scripts (rust-lang/cargo#16678)
- fix(toml): Clarify the edition is on the float (rust-lang/cargo#16676)
- fix(toml): show required rust-version in unstable edition error (rust-lang/cargo#16653)1 file changed
+1
-1
lines changed- .github/workflows/main.yml+1-1
- Cargo.lock+385-146
- Cargo.toml+33-32
- benches/benchsuite/src/bin/capture-last-use.rs+1-1
- ci/validate-version-bump.sh+1-1
- src/bin/cargo/commands/help.rs+206-40
- src/bin/cargo/commands/report.rs+4-1
- src/cargo/core/compiler/custom_build.rs+1-1
- src/cargo/core/features.rs+16
- src/cargo/core/workspace.rs+13-1
- src/cargo/ops/fix/mod.rs+51-5
- src/cargo/util/network/retry.rs+1-1
- src/cargo/util/toml/mod.rs+12-5
- src/doc/man/cargo-help.md+21-1
- src/doc/man/generated_txt/cargo-help.txt+21-1
- src/doc/src/CHANGELOG.md+159-9
- src/doc/src/commands/cargo-help.md+21-1
- src/doc/src/reference/build-scripts.md+1-1
- src/etc/man/cargo-help.1+33-1
- tests/testsuite/artifact_dep.rs+1-1
- tests/testsuite/cargo_add/script_bare/stderr.term.svg+4-4
- tests/testsuite/cargo_add/script_frontmatter_empty/stderr.term.svg+4-4
- tests/testsuite/cargo_add/script_shebang/stderr.term.svg+4-4
- tests/testsuite/cargo_help/help/stdout.term.svg+2-2
- tests/testsuite/cargo_help/nested_alias_dash_joined/mod.rs+1-1
- tests/testsuite/cargo_help/nested_alias_dash_joined/stderr.term.svg+1-13
- tests/testsuite/cargo_help/nested_alias_dash_joined/stdout.term.txt+148
- tests/testsuite/cargo_help/nested_cmd/mod.rs+1-1
- tests/testsuite/cargo_help/nested_cmd/stderr.term.svg+1-19
- tests/testsuite/cargo_help/nested_cmd/stdout.term.txt+148
- tests/testsuite/cargo_help/nested_cmd_dash_joined/mod.rs+1-1
- tests/testsuite/cargo_help/nested_cmd_dash_joined/stderr.term.svg+1-13
- tests/testsuite/cargo_help/nested_cmd_dash_joined/stdout.term.txt+148
- tests/testsuite/cargo_help/nested_cmd_with_extra_flags/stderr.term.svg+8-4
- tests/testsuite/cargo_help/nested_subcommand_suggestion/mod.rs+1-1
- tests/testsuite/cargo_help/nested_subcommand_suggestion/stderr.term.svg+3-11
- tests/testsuite/cargo_help/single_cmd_space_joined/mod.rs+1-1
- tests/testsuite/cargo_help/single_cmd_space_joined/stderr.term.svg+3-11
- tests/testsuite/cargo_help/single_cmd_with_extra_flags/stderr.term.svg+1-1
- tests/testsuite/cargo_remove/script/stderr.term.svg+4-4
- tests/testsuite/cargo_remove/script_last/stderr.term.svg+4-4
- tests/testsuite/cargo_report_future_incompat/help/stdout.term.svg+5-1
- tests/testsuite/edition.rs+39-2
- tests/testsuite/fix.rs+183
- tests/testsuite/git.rs+5-2
- tests/testsuite/inheritable_workspace_fields.rs+3-3
- tests/testsuite/install.rs+5
- tests/testsuite/lints/non_kebab_case_bins.rs+1-1
- tests/testsuite/lints/non_kebab_case_packages.rs+1-1
- tests/testsuite/lints/non_snake_case_packages.rs+1-1
- tests/testsuite/lockfile_path.rs+1-1
- tests/testsuite/registry.rs+1-1
- tests/testsuite/replace.rs+5-2
- tests/testsuite/script/cargo.rs+48-48
- tests/testsuite/vendor.rs+1-1
- tests/testsuite/workspaces.rs+52-1
0 commit comments