Skip to content

Commit

Permalink
Auto merge of rust-lang#117566 - weihanglo:update-cargo, r=weihanglo
Browse files Browse the repository at this point in the history 
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? ghost
  • Loading branch information
@bors
bors committed Nov 4, 2023
2 parents a9b03ff + f358720 commit 2db26d3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 25 files
+173 −145 Cargo.lock
+15 −15 Cargo.toml
+2 −2 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
+4 −0 src/cargo/util/toml/mod.rs
+2 −2 src/cargo/util/workspace.rs
+7 −0 src/doc/src/reference/features.md
+46 −1 src/doc/src/reference/resolver.md
+2 −2 src/doc/src/reference/specifying-dependencies.md
+1 −1 tests/testsuite/bad_config.rs
+2 −2 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
+55 −0 tests/testsuite/features.rs
+4 −4 tests/testsuite/list_availables.rs
+35 −0 tests/testsuite/profile_trim_paths.rs
1 change: 0 additions & 1 deletion src/tools/tidy/src/deps.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ const EXCEPTIONS_CARGO: ExceptionList = &[
// tidy-alphabetical-start
("bitmaps", "MPL-2.0+"),
("bytesize", "Apache-2.0"),
("byteyarn", "Apache-2.0"),
("ciborium", "Apache-2.0"),
("ciborium-io", "Apache-2.0"),
("ciborium-ll", "Apache-2.0"),
Expand Down

0 comments on commit 2db26d3

Please sign in to comment.