Commit d8095ac
committed
Auto merge of rust-lang#112259 - weihanglo:update-cargo, r=weihanglo
Update cargo
14 commits in f7b95e31642e09c2b6eabb18ed75007dda6677a0..b0fa79679e717cd077b7fc0fa4166f47107f1ba9
2023-05-30 19:25:02 +0000 to 2023-06-03 14:19:48 +0000
- Emit error when users try to use a toolchain via the `add` or `install` command (rust-lang/cargo#12226)
- Support "default" option for `build.jobs` (rust-lang/cargo#12222)
- Fix typo in changelog (rust-lang/cargo#12227)
- chore: Sort `-Z` flags match statement (rust-lang/cargo#12223)
- Update curl-sys (rust-lang/cargo#12218)
- Bump to 0.73.0; update changelog (rust-lang/cargo#12219)
- refactor: housekeeping for 1.70.0 (rust-lang/cargo#12217)
- nit: fix typo in changelog for 1.70 (rust-lang/cargo#12215)
- Remove a noop `.clone` (rust-lang/cargo#12213)
- refactor: compiler invocations (rust-lang/cargo#12211)
- cargo clean: use `remove_dir_all` (rust-lang/cargo#11442)
- Add a small note about indexes ignoring SemVer build metadata. (rust-lang/cargo#12206)
- Revert "chore: detect the channel a PR wants to merge into" (rust-lang/cargo#12204)
- Don't distinguish `Debuginfo::None` and `Debuginfo::Explicit(None)` (rust-lang/cargo#12205)
r? `@ghost`1 file changed
+1
-1
lines changed- .github/workflows/main.yml+33-74
- CHANGELOG.md+182-10
- Cargo.lock+3-6
- Cargo.toml+2-5
- ci/matrix.json-44
- ci/which-channel.sh-50
- crates/cargo-test-support/src/paths.rs+11-10
- crates/cargo-test-support/src/tools.rs+8-7
- crates/cargo-util/src/paths.rs+13-2
- crates/resolver-tests/Cargo.toml-1
- crates/resolver-tests/tests/resolve.rs+3-1
- src/bin/cargo/cli.rs+16-13
- src/bin/cargo/commands/add.rs+13
- src/bin/cargo/commands/install.rs+11
- src/cargo/core/compiler/build_config.rs+17-5
- src/cargo/core/compiler/custom_build.rs+50-9
- src/cargo/core/compiler/mod.rs+90-118
- src/cargo/core/features.rs+62-54
- src/cargo/core/package_id.rs+6-5
- src/cargo/core/profiles.rs+22-32
- src/cargo/core/shell.rs+1-1
- src/cargo/core/source/source_id.rs+6-4
- src/cargo/ops/cargo_clean.rs+6-1
- src/cargo/ops/cargo_fetch.rs+2-1
- src/cargo/ops/cargo_package.rs+4-3
- src/cargo/ops/cargo_test.rs-2
- src/cargo/ops/registry.rs+3-3
- src/cargo/sources/git/known_hosts.rs+1-1
- src/cargo/util/command_prelude.rs+13-3
- src/cargo/util/config/mod.rs+20-1
- src/cargo/util/config/target.rs+9-9
- src/cargo/util/interning.rs+6-4
- src/doc/man/generated_txt/cargo-bench.txt+1
- src/doc/man/generated_txt/cargo-build.txt+1
- src/doc/man/generated_txt/cargo-check.txt+1
- src/doc/man/generated_txt/cargo-doc.txt+1
- src/doc/man/generated_txt/cargo-fix.txt+1
- src/doc/man/generated_txt/cargo-install.txt+1
- src/doc/man/generated_txt/cargo-package.txt+1
- src/doc/man/generated_txt/cargo-publish.txt+1
- src/doc/man/generated_txt/cargo-run.txt+1
- src/doc/man/generated_txt/cargo-rustc.txt+1
- src/doc/man/generated_txt/cargo-rustdoc.txt+1
- src/doc/man/generated_txt/cargo-test.txt+1
- src/doc/man/includes/options-jobs.md+2-1
- src/doc/src/commands/cargo-bench.md+2-1
- src/doc/src/commands/cargo-build.md+2-1
- src/doc/src/commands/cargo-check.md+2-1
- src/doc/src/commands/cargo-doc.md+2-1
- src/doc/src/commands/cargo-fix.md+2-1
- src/doc/src/commands/cargo-install.md+2-1
- src/doc/src/commands/cargo-package.md+2-1
- src/doc/src/commands/cargo-publish.md+2-1
- src/doc/src/commands/cargo-run.md+2-1
- src/doc/src/commands/cargo-rustc.md+2-1
- src/doc/src/commands/cargo-rustdoc.md+2-1
- src/doc/src/commands/cargo-test.md+2-1
- src/doc/src/reference/config.md+3-2
- src/doc/src/reference/registry-index.md+10
- src/etc/man/cargo-bench.1+2-1
- src/etc/man/cargo-build.1+2-1
- src/etc/man/cargo-check.1+2-1
- src/etc/man/cargo-doc.1+2-1
- src/etc/man/cargo-fix.1+2-1
- src/etc/man/cargo-install.1+2-1
- src/etc/man/cargo-package.1+2-1
- src/etc/man/cargo-publish.1+2-1
- src/etc/man/cargo-run.1+2-1
- src/etc/man/cargo-rustc.1+2-1
- src/etc/man/cargo-rustdoc.1+2-1
- src/etc/man/cargo-test.1+2-1
- tests/testsuite/build.rs+13-11
- tests/testsuite/build_script.rs+1-1
- tests/testsuite/cargo_add/add_toolchain/in+1
- tests/testsuite/cargo_add/add_toolchain/mod.rs+23
- tests/testsuite/cargo_add/add_toolchain/out/Cargo.toml+5
- tests/testsuite/cargo_add/add_toolchain/stderr.log+2
- tests/testsuite/cargo_add/add_toolchain/stdout.log
- tests/testsuite/cargo_add/mod.rs+1
- tests/testsuite/config.rs+61-1
- tests/testsuite/cross_compile.rs+1-1
- tests/testsuite/install.rs+14
- tests/testsuite/profile_config.rs+7-6
- tests/testsuite/profile_targets.rs+27-24
- tests/testsuite/profiles.rs+20-13
- tests/testsuite/run.rs+2-2
- tests/testsuite/rustc.rs+11-11
0 commit comments