Skip to content

Commit

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

14 commits in 15fbd2f607d4defc87053b8b76bf5038f2483cf4..8c30ce53688e25f7e9d860b33cc914fb2957ca9a
2024-10-08 21:08:11 +0000 to 2024-10-15 16:43:16 +0000
- docs: More information on what is and isn't included by cargo package (rust-lang/cargo#14684)
- fix(resolver): share conflict cache between activation retries (rust-lang/cargo#14692)
- fix(git): dont fetch tags by default (rust-lang/cargo#14688)
- Support package selection options like `--exclude` in `cargo publish` (rust-lang/cargo#14659)
- docs: install options -> uninstall options (rust-lang/cargo#14682)
- docs: tools should only interpret a line starting with `{` as JSON (rust-lang/cargo#14677)
- cargo test --help: clarify --tests and --benches (rust-lang/cargo#14675)
- docs(env): minor improvements in environment variables doc (rust-lang/cargo#14676)
- docs: document official external commands (rust-lang/cargo#14669)
- Fix panic when running cargo tree on a package with a cross compiled bindep (rust-lang/cargo#14593)
- Remove the support for `Cargo.toml` of the cargo-script (rust-lang/cargo#14670)
- docs(resolver): Lay groundwork for documenting MSRV-aware logic (rust-lang/cargo#14662)
- chore(deps): update rust crate pulldown-cmark to 0.12.0 (rust-lang/cargo#14668)
- Improve resolver speed (rust-lang/cargo#14663)
  • Loading branch information
@bors
bors committed Oct 15, 2024
2 parents e7c0d27 + 2bf120d commit 9ce3675
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 78 files
+10 −1 .ignore
+11 −4 Cargo.lock
+3 −1 Cargo.toml
+13 −4 crates/mdman/src/format/man.rs
+12 −3 crates/mdman/src/format/text.rs
+1 −1 crates/resolver-tests/src/sat.rs
+46 −2 crates/resolver-tests/tests/resolve.rs
+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
+22 −1 src/bin/cargo/commands/publish.rs
+1 −3 src/bin/cargo/commands/run.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
+8 −10 src/cargo/core/resolver/conflict_cache.rs
+9 −7 src/cargo/core/resolver/context.rs
+15 −8 src/cargo/core/resolver/mod.rs
+26 −4 src/cargo/ops/tree/graph.rs
+2 −0 src/cargo/sources/git/utils.rs
+1 −1 src/cargo/util/graph.rs
+4 −0 src/doc/man/cargo-package.md
+58 −1 src/doc/man/cargo-publish.md
+1 −1 src/doc/man/cargo-uninstall.md
+10 −10 src/doc/man/generated_txt/cargo-bench.txt
+14 −14 src/doc/man/generated_txt/cargo-build.txt
+14 −14 src/doc/man/generated_txt/cargo-check.txt
+14 −14 src/doc/man/generated_txt/cargo-fix.txt
+9 −0 src/doc/man/generated_txt/cargo-package.txt
+58 −4 src/doc/man/generated_txt/cargo-publish.txt
+14 −14 src/doc/man/generated_txt/cargo-rustc.txt
+12 −12 src/doc/man/generated_txt/cargo-rustdoc.txt
+14 −14 src/doc/man/generated_txt/cargo-test.txt
+1 −1 src/doc/man/generated_txt/cargo-uninstall.txt
+2 −2 src/doc/man/includes/options-targets.md
+5 −2 src/doc/src/SUMMARY.md
+4 −1 src/doc/src/commands/build-commands.md
+2 −2 src/doc/src/commands/cargo-bench.md
+2 −2 src/doc/src/commands/cargo-build.md
+2 −2 src/doc/src/commands/cargo-check.md
+20 −0 src/doc/src/commands/cargo-clippy.md
+2 −2 src/doc/src/commands/cargo-fix.md
+20 −0 src/doc/src/commands/cargo-fmt.md
+22 −0 src/doc/src/commands/cargo-miri.md
+4 −0 src/doc/src/commands/cargo-package.md
+49 −6 src/doc/src/commands/cargo-publish.md
+2 −2 src/doc/src/commands/cargo-rustc.md
+2 −2 src/doc/src/commands/cargo-rustdoc.md
+2 −2 src/doc/src/commands/cargo-test.md
+1 −1 src/doc/src/commands/cargo-uninstall.md
+7 −3 src/doc/src/reference/environment-variables.md
+6 −0 src/doc/src/reference/external-tools.md
+17 −15 src/doc/src/reference/manifest.md
+140 −120 src/doc/src/reference/resolver.md
+50 −23 src/doc/src/reference/specifying-dependencies.md
+2 −2 src/etc/man/cargo-bench.1
+2 −2 src/etc/man/cargo-build.1
+2 −2 src/etc/man/cargo-check.1
+2 −2 src/etc/man/cargo-fix.1
+9 −0 src/etc/man/cargo-package.1
+53 −8 src/etc/man/cargo-publish.1
+2 −2 src/etc/man/cargo-rustc.1
+2 −2 src/etc/man/cargo-rustdoc.1
+2 −2 src/etc/man/cargo-test.1
+1 −1 src/etc/man/cargo-uninstall.1
+84 −5 tests/testsuite/artifact_dep.rs
+2 −2 tests/testsuite/cargo_bench/help/stdout.term.svg
+2 −2 tests/testsuite/cargo_build/help/stdout.term.svg
+2 −2 tests/testsuite/cargo_check/help/stdout.term.svg
+2 −2 tests/testsuite/cargo_fix/help/stdout.term.svg
+26 −22 tests/testsuite/cargo_publish/help/stdout.term.svg
+2 −2 tests/testsuite/cargo_rustc/help/stdout.term.svg
+2 −2 tests/testsuite/cargo_rustdoc/help/stdout.term.svg
+2 −2 tests/testsuite/cargo_test/help/stdout.term.svg
+1 −1 tests/testsuite/git.rs
+114 −0 tests/testsuite/publish.rs
+0 −22 tests/testsuite/script.rs

0 comments on commit 9ce3675

Please sign in to comment.