Skip to content

Commit

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

7 commits in 65e297d1ec0dee1a74800efe600b8dc163bcf5db..7046d992f9f32ba209a8079f662ebccf9da8de25
2023-11-03 20:56:31 +0000 to 2023-11-08 03:24:57 +0000
- fix: Report more detailed semver errors (rust-lang/cargo#12924)
- Fix some broken links in the man pages (rust-lang/cargo#12929)
- Add better error message when it can not find the search section (rust-lang/cargo#12865)
- Bug 12920 (rust-lang/cargo#12923)
- Update link in environment-variables.md (rust-lang/cargo#12922)
- refactor(toml): Pull out the schema (rust-lang/cargo#12911)
- tests: Remove plugin tests (rust-lang/cargo#12921)

r? ghost
  • Loading branch information
@bors
bors committed Nov 8, 2023
2 parents 91cfcb0 + 0670466 commit 7cc997d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 46 files
+1 −0 Cargo.lock
+2 −1 crates/xtask-bump-check/Cargo.toml
+1 −2 crates/xtask-bump-check/src/xtask.rs
+1 −2 src/bin/cargo/commands/install.rs
+1 −1 src/bin/cargo/main.rs
+2 −2 src/cargo/core/compiler/mod.rs
+1 −1 src/cargo/core/features.rs
+1 −1 src/cargo/core/manifest.rs
+1 −1 src/cargo/core/mod.rs
+5 −5 src/cargo/core/package_id.rs
+3 −3 src/cargo/core/profiles.rs
+3 −1 src/cargo/core/workspace.rs
+1 −1 src/cargo/lib.rs
+1 −1 src/cargo/ops/cargo_package.rs
+1 −1 src/cargo/sources/registry/index.rs
+1 −1 src/cargo/util/command_prelude.rs
+0 −2 src/cargo/util/mod.rs
+0 −6 src/cargo/util/semver_ext.rs
+0 −36 src/cargo/util/to_semver.rs
+151 −1,255 src/cargo/util/toml/mod.rs
+1,134 −0 src/cargo/util/toml/schema.rs
+1 −1 src/cargo/util/toml/targets.rs
+31 −12 src/cargo/util/toml_mut/manifest.rs
+1 −1 src/doc/man/cargo-add.md
+1 −1 src/doc/man/cargo-install.md
+2 −2 src/doc/man/generated_txt/cargo-add.txt
+1 −1 src/doc/man/generated_txt/cargo-install.txt
+1 −1 src/doc/src/commands/cargo-add.md
+1 −1 src/doc/src/commands/cargo-install.md
+1 −1 src/doc/src/reference/environment-variables.md
+1 −1 src/etc/man/cargo-add.1
+1 −1 src/etc/man/cargo-install.1
+1 −1 tests/testsuite/cargo_remove/invalid_dep/stderr.log
+1 −1 tests/testsuite/cargo_remove/invalid_section/stderr.log
+1 −1 tests/testsuite/cargo_remove/invalid_section_dep/stderr.log
+1 −1 tests/testsuite/cargo_remove/invalid_target/stderr.log
+1 −1 tests/testsuite/cargo_remove/invalid_target_dep/stderr.log
+3 −3 tests/testsuite/config.rs
+0 −86 tests/testsuite/cross_compile.rs
+1 −1 tests/testsuite/install_upgrade.rs
+0 −1 tests/testsuite/main.rs
+0 −421 tests/testsuite/plugins.rs
+0 −46 tests/testsuite/proc_macro.rs
+1 −1 tests/testsuite/profile_config.rs
+54 −0 tests/testsuite/update.rs
+0 −1 triagebot.toml

0 comments on commit 7cc997d

Please sign in to comment.