Commit 2db26d3
committed
Auto merge of rust-lang#117566 - weihanglo:update-cargo, r=weihanglo
Update cargo
8 commits in b4d18d4bd3db6d872892f6c87c51a02999b80802..65e297d1ec0dee1a74800efe600b8dc163bcf5db
2023-10-31 18:19:10 +0000 to 2023-11-03 20:56:31 +0000
- fix(cli): Clarify --test is for targets, not test functions (rust-lang/cargo#12915)
- Updating "features" documentation to add a note about the new limit on number of features (rust-lang/cargo#12913)
- fix: merge `trim-paths` from different profiles (rust-lang/cargo#12908)
- Add regression test for issue 6915: features and transitive dev deps (rust-lang/cargo#12907)
- chore(deps): update rust crate gix to 0.55.2 (rust-lang/cargo#12906)
- chore(deps): update compatible (rust-lang/cargo#12905)
- docs(ref): Fix open-semver-range issue link (rust-lang/cargo#12904)
- docs(ref): Highlight commands to answer dep resolution questions (rust-lang/cargo#12903)
r? ghost2 files changed
+1
-2
lines changed- Cargo.lock+173-145
- Cargo.toml+15-15
- src/bin/cargo/commands/bench.rs+2-2
- src/bin/cargo/commands/build.rs+2-2
- src/bin/cargo/commands/check.rs+2-2
- src/bin/cargo/commands/fix.rs+2-2
- src/bin/cargo/commands/rustc.rs+2-2
- src/bin/cargo/commands/rustdoc.rs+2-2
- src/bin/cargo/commands/test.rs+2-2
- src/cargo/util/toml/mod.rs+4
- src/cargo/util/workspace.rs+2-2
- src/doc/src/reference/features.md+7
- src/doc/src/reference/resolver.md+46-1
- src/doc/src/reference/specifying-dependencies.md+2-2
- tests/testsuite/bad_config.rs+1-1
- tests/testsuite/cargo_bench/help/stdout.log+2-2
- tests/testsuite/cargo_build/help/stdout.log+2-2
- tests/testsuite/cargo_check/help/stdout.log+2-2
- tests/testsuite/cargo_fix/help/stdout.log+2-2
- tests/testsuite/cargo_rustc/help/stdout.log+2-2
- tests/testsuite/cargo_rustdoc/help/stdout.log+2-2
- tests/testsuite/cargo_test/help/stdout.log+2-2
- tests/testsuite/features.rs+55
- tests/testsuite/list_availables.rs+4-4
- tests/testsuite/profile_trim_paths.rs+35
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
110 | | - | |
111 | 110 | | |
112 | 111 | | |
113 | 112 | | |
| |||
0 commit comments