Skip to content

Commit

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

8 commits in 3e428a38a34e820a461d2cc082e726d3bda71bcb..84976cd699f4aea56cb3a90ce3eedeed9e20d5a5
2024-01-09 20:46:36 +0000 to 2024-01-12 15:55:43 +0000
- fix(resolver): do not panic when sorting empty summaries (rust-lang/cargo#13287)
- Implementation of shallow libgit2 fetches behind an unstable flag (rust-lang/cargo#13252)
- Add documentation entry for unstable `--output-format` flag (rust-lang/cargo#13284)
- doc: add `public` info in `cargo-add` man page. (rust-lang/cargo#13272)
- More docs on prerelease compat (rust-lang/cargo#13286)
- Add unstable `--output-format` option to  `cargo rustdoc` (rust-lang/cargo#12252)
- feat: Add `rustc` style errors for manifest parsing (rust-lang/cargo#13172)
- Document why `du` function uses mutex (rust-lang/cargo#13273)

r? ghost
  • Loading branch information
@bors
bors committed Jan 13, 2024
2 parents 3071aef + 1641d31 commit 1825374
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 57 files
+12 −1 Cargo.lock
+2 −0 Cargo.toml
+1 −1 crates/cargo-util/Cargo.toml
+7 −0 crates/cargo-util/src/du.rs
+4 −4 src/bin/cargo/commands/add.rs
+2 −0 src/bin/cargo/commands/doc.rs
+22 −2 src/bin/cargo/commands/rustdoc.rs
+3 −1 src/cargo/core/compiler/build_config.rs
+10 −5 src/cargo/core/compiler/context/compilation_files.rs
+2 −0 src/cargo/core/compiler/mod.rs
+25 −0 src/cargo/core/compiler/rustdoc.rs
+1 −1 src/cargo/core/compiler/unit_dependencies.rs
+45 −12 src/cargo/core/features.rs
+10 −1 src/cargo/core/resolver/version_prefs.rs
+1 −1 src/cargo/ops/cargo_compile/mod.rs
+47 −4 src/cargo/ops/cargo_doc.rs
+1 −1 src/cargo/ops/mod.rs
+6 −5 src/cargo/sources/git/mod.rs
+3 −4 src/cargo/sources/git/oxide.rs
+2 −2 src/cargo/sources/git/source.rs
+3 −0 src/cargo/sources/git/utils.rs
+2 −2 src/cargo/sources/registry/mod.rs
+98 −7 src/cargo/util/toml/mod.rs
+16 −0 src/doc/man/cargo-add.md
+1 −0 src/doc/man/cargo-rustdoc.md
+17 −0 src/doc/man/generated_txt/cargo-add.txt
+12 −0 src/doc/man/generated_txt/cargo-rustdoc.txt
+9 −0 src/doc/man/includes/options-output-format.md
+12 −0 src/doc/src/commands/cargo-add.md
+9 −0 src/doc/src/commands/cargo-rustdoc.md
+14 −6 src/doc/src/reference/resolver.md
+28 −3 src/doc/src/reference/unstable.md
+18 −0 src/etc/man/cargo-add.1
+16 −0 src/etc/man/cargo-rustdoc.1
+15 −16 tests/testsuite/alt_registry.rs
+39 −51 tests/testsuite/bad_config.rs
+38 −50 tests/testsuite/build.rs
+1 −0 tests/testsuite/cargo/z_help/stdout.log
+2 −2 tests/testsuite/cargo_add/help/stdout.log
+7 −9 tests/testsuite/cargo_add/invalid_manifest/stderr.log
+6 −8 tests/testsuite/cargo_features.rs
+1 −0 tests/testsuite/cargo_rustdoc/help/stdout.log
+24 −36 tests/testsuite/features.rs
+6 −8 tests/testsuite/features_namespaced.rs
+6 −10 tests/testsuite/git.rs
+69 −28 tests/testsuite/git_shallow.rs
+13 −17 tests/testsuite/inheritable_workspace_fields.rs
+1 −1 tests/testsuite/install.rs
+18 −24 tests/testsuite/lints.rs
+15 −12 tests/testsuite/member_errors.rs
+22 −24 tests/testsuite/metadata.rs
+3 −2 tests/testsuite/offline.rs
+5 −2 tests/testsuite/patch.rs
+23 −29 tests/testsuite/profile_custom.rs
+28 −32 tests/testsuite/rust_version.rs
+82 −0 tests/testsuite/rustdoc.rs
+17 −10 tests/testsuite/workspaces.rs

0 comments on commit 1825374

Please sign in to comment.