Skip to content

Commit

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

3 commits in 80eca0e58fb2ff52c1e94fc191b55b37ed73e0e4..2cc50bc0b63ad20da193e002ba11d391af0104b7
2023-08-19 00:52:06 +0000 to 2023-08-22 22:43:08 +0000
- config: merge lists in precedence order (rust-lang/cargo#12515)
- ci: test `resolver-tests` in a separate job (rust-lang/cargo#12540)
- refactor: Use clap to suggest alternative argument for unsupported arguments (rust-lang/cargo#12529)

r? ghost
  • Loading branch information
@bors
bors committed Aug 23, 2023
2 parents c6f5495 + 4dd31a2 commit e3a0e38
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 56 files
+1 −1 .github/workflows/main.yml
+149 −4 CHANGELOG.md
+5 −5 Cargo.lock
+2 −2 Cargo.toml
+2 −12 src/bin/cargo/commands/bench.rs
+1 −1 src/bin/cargo/commands/build.rs
+1 −1 src/bin/cargo/commands/check.rs
+1 −1 src/bin/cargo/commands/doc.rs
+1 −1 src/bin/cargo/commands/fix.rs
+1 −1 src/bin/cargo/commands/install.rs
+1 −1 src/bin/cargo/commands/package.rs
+1 −1 src/bin/cargo/commands/publish.rs
+1 −1 src/bin/cargo/commands/run.rs
+1 −1 src/bin/cargo/commands/rustc.rs
+1 −1 src/bin/cargo/commands/rustdoc.rs
+2 −12 src/bin/cargo/commands/test.rs
+16 −32 src/bin/cargo/commands/vendor.rs
+1 −1 src/cargo/ops/cargo_compile/mod.rs
+0 −6 src/cargo/ops/cargo_new.rs
+24 −4 src/cargo/util/command_prelude.rs
+10 −3 src/cargo/util/config/mod.rs
+19 −0 src/cargo/util/config/value.rs
+39 −25 src/doc/src/faq.md
+5 −8 src/doc/src/guide/cargo-toml-vs-cargo-lock.md
+57 −20 src/doc/src/guide/continuous-integration.md
+2 −1 src/doc/src/reference/config.md
+0 −18 tests/testsuite/bench.rs
+1 −0 tests/testsuite/cargo_bench/mod.rs
+3 −0 tests/testsuite/cargo_bench/no_keep_going/in/Cargo.toml
+0 −0 tests/testsuite/cargo_bench/no_keep_going/in/src/lib.rs
+19 −0 tests/testsuite/cargo_bench/no_keep_going/mod.rs
+7 −0 tests/testsuite/cargo_bench/no_keep_going/stderr.log
+0 −0 tests/testsuite/cargo_bench/no_keep_going/stdout.log
+11 −11 tests/testsuite/cargo_config/mod.rs
+0 −1 tests/testsuite/cargo_init/auto_git/out/.gitignore
+0 −1 tests/testsuite/cargo_init/fossil_autodetect/out/.fossil-settings/clean-glob
+0 −1 tests/testsuite/cargo_init/fossil_autodetect/out/.fossil-settings/ignore-glob
+0 −1 tests/testsuite/cargo_init/git_autodetect/out/.gitignore
+0 −1 tests/testsuite/cargo_init/git_ignore_exists_no_conflicting_entries/out/.gitignore
+0 −1 tests/testsuite/cargo_init/inferred_lib_with_git/out/.gitignore
+0 −1 tests/testsuite/cargo_init/mercurial_autodetect/out/.hgignore
+0 −1 tests/testsuite/cargo_init/pijul_autodetect/out/.ignore
+0 −1 tests/testsuite/cargo_init/simple_git/out/.gitignore
+0 −1 tests/testsuite/cargo_init/simple_git_ignore_exists/out/.gitignore
+0 −1 tests/testsuite/cargo_init/simple_hg/out/.hgignore
+0 −1 tests/testsuite/cargo_init/simple_hg_ignore_exists/out/.hgignore
+1 −0 tests/testsuite/cargo_test/mod.rs
+3 −0 tests/testsuite/cargo_test/no_keep_going/in/Cargo.toml
+0 −0 tests/testsuite/cargo_test/no_keep_going/in/src/lib.rs
+19 −0 tests/testsuite/cargo_test/no_keep_going/mod.rs
+7 −0 tests/testsuite/cargo_test/no_keep_going/stderr.log
+0 −0 tests/testsuite/cargo_test/no_keep_going/stdout.log
+9 −9 tests/testsuite/config.rs
+4 −6 tests/testsuite/config_cli.rs
+2 −2 tests/testsuite/new.rs
+0 −18 tests/testsuite/test.rs

0 comments on commit e3a0e38

Please sign in to comment.