Skip to content

Commit

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

11 commits in f772ec0224d3755ce52ac5128a80319fb2eb45d0..c3c417b85e01a1de1633317fa55e4f1a31e346d4
2024-03-01 22:57:35 +0000 to 2024-03-06 01:16:08 +0000
- fix(rustdoc-map): dedup `--extern-html-too-url` for same unit (rust-lang/cargo#13544)
- test: Add test for packaging a public dependency (rust-lang/cargo#13536)
- doc: Edits for git/path dependency sections (rust-lang/cargo#13341)
- feat(cli): Allow logging to chrome traces (rust-lang/cargo#13399)
- fix(log): Trace parameters to align with profile (rust-lang/cargo#13538)
- fix(toml): Don't warn on unset Edition if only 2015 is compatible (rust-lang/cargo#13533)
- fix(cli): Trace core cargo operations (rust-lang/cargo#13532)
- chore: update pulldown-cmark to 0.10.0 (rust-lang/cargo#13517)
- feat(add): Fallback to `rustc -v` when no MSRV is set (rust-lang/cargo#13516)
- chore(ci): Ensure lockfile is respected during MSRV testing (rust-lang/cargo#13523)
- feat: Use consistent colors when testing (rust-lang/cargo#13520)

r? ghost
  • Loading branch information
@bors
bors committed Mar 6, 2024
2 parents b77e018 + 44e5cff commit 07a39aa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 91 files
+1 −1 .github/workflows/main.yml
+22 −3 Cargo.lock
+4 −1 Cargo.toml
+45 −35 crates/mdman/src/format/man.rs
+50 −40 crates/mdman/src/format/text.rs
+14 −7 crates/mdman/src/lib.rs
+2 −2 crates/mdman/src/util.rs
+2 −2 crates/mdman/tests/compare/expected/tables.md
+2 −2 crates/mdman/tests/compare/tables.md
+5 −0 src/bin/cargo/cli.rs
+35 −6 src/bin/cargo/main.rs
+5 −3 src/cargo/core/compiler/build_runner/mod.rs
+2 −7 src/cargo/core/compiler/custom_build.rs
+5 −6 src/cargo/core/compiler/fingerprint/mod.rs
+2 −2 src/cargo/core/compiler/job_queue/mod.rs
+2 −3 src/cargo/core/compiler/mod.rs
+7 −0 src/cargo/core/compiler/rustdoc.rs
+1 −0 src/cargo/core/compiler/unit_dependencies.rs
+9 −13 src/cargo/core/global_cache_tracker.rs
+1 −0 src/cargo/core/package.rs
+1 −2 src/cargo/core/resolver/features.rs
+1 −2 src/cargo/core/resolver/mod.rs
+78 −64 src/cargo/ops/cargo_add/mod.rs
+3 −2 src/cargo/ops/cargo_compile/mod.rs
+2 −0 src/cargo/ops/lockfile.rs
+4 −3 src/cargo/ops/resolve.rs
+1 −0 src/cargo/util/command_prelude.rs
+3 −0 src/cargo/util/context/mod.rs
+0 −1 src/cargo/util/mod.rs
+0 −92 src/cargo/util/profile.rs
+2 −3 src/cargo/util/rustc.rs
+15 −10 src/cargo/util/toml/mod.rs
+15 −6 src/doc/contrib/src/tests/profiling.md
+2 −2 src/doc/src/commands/cargo-add.md
+1 −1 src/doc/src/commands/cargo-bench.md
+1 −1 src/doc/src/commands/cargo-build.md
+1 −1 src/doc/src/commands/cargo-check.md
+1 −1 src/doc/src/commands/cargo-doc.md
+1 −1 src/doc/src/commands/cargo-fix.md
+1 −1 src/doc/src/commands/cargo-install.md
+1 −1 src/doc/src/commands/cargo-metadata.md
+1 −1 src/doc/src/commands/cargo-package.md
+1 −1 src/doc/src/commands/cargo-test.md
+2 −2 src/doc/src/commands/cargo-tree.md
+121 −54 src/doc/src/reference/specifying-dependencies.md
+2 −2 src/etc/man/cargo-add.1
+9 −9 src/etc/man/cargo-bench.1
+6 −6 src/etc/man/cargo-build.1
+5 −5 src/etc/man/cargo-check.1
+1 −1 src/etc/man/cargo-doc.1
+5 −5 src/etc/man/cargo-fix.1
+3 −3 src/etc/man/cargo-install.1
+1 −1 src/etc/man/cargo-metadata.1
+1 −1 src/etc/man/cargo-package.1
+1 −1 src/etc/man/cargo-publish.1
+2 −2 src/etc/man/cargo-run.1
+5 −5 src/etc/man/cargo-rustc.1
+4 −4 src/etc/man/cargo-rustdoc.1
+6 −6 src/etc/man/cargo-test.1
+2 −2 src/etc/man/cargo-tree.1
+7 −7 tests/testsuite/cargo_add/invalid_manifest/stderr.term.svg
+4 −0 tests/testsuite/cargo_add/mod.rs
+4 −6 tests/testsuite/cargo_add/rust_version_incompatible/stderr.term.svg
+2 −2 tests/testsuite/cargo_add/rust_version_older/stderr.term.svg
+6 −0 tests/testsuite/cargo_add/rustc_ignore/in/Cargo.toml
+0 −0 tests/testsuite/cargo_add/rustc_ignore/in/src/lib.rs
+38 −0 tests/testsuite/cargo_add/rustc_ignore/mod.rs
+9 −0 tests/testsuite/cargo_add/rustc_ignore/out/Cargo.toml
+0 −0 tests/testsuite/cargo_add/rustc_ignore/out/src/lib.rs
+29 −0 tests/testsuite/cargo_add/rustc_ignore/stderr.term.svg
+6 −0 tests/testsuite/cargo_add/rustc_incompatible/in/Cargo.toml
+0 −0 tests/testsuite/cargo_add/rustc_incompatible/in/src/lib.rs
+31 −0 tests/testsuite/cargo_add/rustc_incompatible/mod.rs
+6 −0 tests/testsuite/cargo_add/rustc_incompatible/out/Cargo.toml
+0 −0 tests/testsuite/cargo_add/rustc_incompatible/out/src/lib.rs
+32 −0 tests/testsuite/cargo_add/rustc_incompatible/stderr.term.svg
+6 −0 tests/testsuite/cargo_add/rustc_latest/in/Cargo.toml
+0 −0 tests/testsuite/cargo_add/rustc_latest/in/src/lib.rs
+37 −0 tests/testsuite/cargo_add/rustc_latest/mod.rs
+9 −0 tests/testsuite/cargo_add/rustc_latest/out/Cargo.toml
+0 −0 tests/testsuite/cargo_add/rustc_latest/out/src/lib.rs
+32 −0 tests/testsuite/cargo_add/rustc_latest/stderr.term.svg
+6 −0 tests/testsuite/cargo_add/rustc_older/in/Cargo.toml
+0 −0 tests/testsuite/cargo_add/rustc_older/in/src/lib.rs
+37 −0 tests/testsuite/cargo_add/rustc_older/mod.rs
+9 −0 tests/testsuite/cargo_add/rustc_older/out/Cargo.toml
+0 −0 tests/testsuite/cargo_add/rustc_older/out/src/lib.rs
+32 −0 tests/testsuite/cargo_add/rustc_older/stderr.term.svg
+0 −1 tests/testsuite/edition.rs
+78 −1 tests/testsuite/package.rs
+47 −0 tests/testsuite/rustdoc_extern_html.rs

0 comments on commit 07a39aa

Please sign in to comment.