Skip to content

Commit

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

5 commits in 794d0a82547f3081044c0aca7b6083733ce51344..6fa6fdc7606cfa664f9bee2fb33ee2ed904f4e88
2023-10-03 23:19:33 +0000 to 2023-10-10 23:06:08 +0000
- test(build): generalize test assertion for non-rustup env (rust-lang/cargo#12804)
- chore: Sort dependency tables (rust-lang/cargo#12803)
- fix(install): Suggest an alternative version on MSRV failure (rust-lang/cargo#12798)
- rustdoc: remove the word "Version" from test cases (rust-lang/cargo#12800)
- Add unsupported lowercase `-z` flag suggestion for `-Z` flag (rust-lang/cargo#12788)

r? ghost
  • Loading branch information
@bors
bors committed Oct 11, 2023
2 parents 36cbf94 + 7774141 commit 2e7e0fb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 70 files
+35 −5 .github/renovate.json5
+5 −5 .github/workflows/main.yml
+213 −2 CHANGELOG.md
+28 −15 Cargo.lock
+8 −7 Cargo.toml
+2 −1 crates/cargo-platform/Cargo.toml
+1 −0 crates/cargo-test-support/src/compare.rs
+48 −0 crates/cargo-test-support/src/lib.rs
+2 −2 crates/cargo-util/Cargo.toml
+1 −1 crates/crates-io/Cargo.toml
+4 −0 crates/crates-io/lib.rs
+1 −0 crates/home/Cargo.toml
+4 −17 crates/xtask-bump-check/src/xtask.rs
+2 −1 credential/cargo-credential-1password/Cargo.toml
+2 −1 credential/cargo-credential-libsecret/Cargo.toml
+2 −1 credential/cargo-credential-macos-keychain/Cargo.toml
+2 −1 credential/cargo-credential-wincred/Cargo.toml
+2 −2 credential/cargo-credential/Cargo.toml
+23 −9 src/bin/cargo/cli.rs
+1 −8 src/bin/cargo/commands/build.rs
+8 −0 src/cargo/core/compiler/context/mod.rs
+7 −3 src/cargo/core/compiler/future_incompat.rs
+1 −1 src/cargo/core/compiler/layout.rs
+19 −6 src/cargo/core/features.rs
+8 −3 src/cargo/core/package.rs
+19 −15 src/cargo/core/package_id.rs
+4 −1 src/cargo/ops/cargo_add/mod.rs
+4 −1 src/cargo/ops/cargo_generate_lockfile.rs
+39 −3 src/cargo/ops/cargo_install.rs
+3 −2 src/cargo/ops/cargo_package.rs
+1 −0 src/cargo/ops/cargo_uninstall.rs
+60 −8 src/cargo/ops/common_for_install_and_uninstall.rs
+3 −3 src/cargo/ops/lockfile.rs
+2 −1 src/cargo/ops/registry/mod.rs
+2 −1 src/cargo/ops/registry/publish.rs
+4 −1 src/cargo/ops/resolve.rs
+4 −1 src/cargo/sources/git/source.rs
+4 −3 src/cargo/sources/registry/download.rs
+4 −1 src/cargo/sources/registry/http_remote.rs
+2 −1 src/cargo/sources/registry/index.rs
+4 −1 src/cargo/sources/registry/mod.rs
+11 −4 src/cargo/sources/registry/remote.rs
+549 −0 src/cargo/util/cache_lock.rs
+21 −0 src/cargo/util/command_prelude.rs
+36 −85 src/cargo/util/config/mod.rs
+183 −104 src/cargo/util/flock.rs
+1 −0 src/cargo/util/mod.rs
+2,664 −2,662 src/cargo/util/toml/mod.rs
+1 −1 src/cargo/util/toml/targets.rs
+1 −1 src/doc/man/generated_txt/cargo-init.txt
+1 −1 src/doc/man/generated_txt/cargo-new.txt
+1 −1 src/doc/man/includes/options-new.md
+1 −1 src/doc/src/commands/cargo-init.md
+1 −1 src/doc/src/commands/cargo-new.md
+1 −1 src/doc/src/reference/publishing.md
+27 −0 src/doc/src/reference/unstable.md
+1 −1 src/etc/man/cargo-init.1
+1 −1 src/etc/man/cargo-new.1
+51 −1 tests/testsuite/build.rs
+304 −0 tests/testsuite/cache_lock.rs
+1 −1 tests/testsuite/cargo_init/help/stdout.log
+1 −1 tests/testsuite/cargo_new/help/stdout.log
+28 −5 tests/testsuite/config.rs
+2 −2 tests/testsuite/doc.rs
+20 −0 tests/testsuite/install.rs
+1 −0 tests/testsuite/main.rs
+23 −0 tests/testsuite/out_dir.rs
+2 −2 tests/testsuite/package.rs
+5 −3 tests/testsuite/rustdocflags.rs
+4 −1 tests/testsuite/search.rs

0 comments on commit 2e7e0fb

Please sign in to comment.