Skip to content

Commit

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

2 commits in 1cff2ee6b92e0ad3f87c44b70b28f788b2528b3c..1ae631085f01c1a72d05df1ec81f3759a8360042
2024-01-16 16:56:57 +0000 to 2024-01-17 17:26:41 +0000
- fix(json-msg): use pkgid spec in in JSON messages (rust-lang/cargo#13311)
- doc(features): Highlight the non-blocking feature gating technique (rust-lang/cargo#13307)

r? oli-obk

Could you check if this fixes miri build?
  • Loading branch information
@bors
bors committed Jan 18, 2024
2 parents 6ae4cfb + c70773d commit 41b6596
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 21 files
+1 −1 src/cargo/core/compiler/custom_build.rs
+2 −2 src/cargo/core/compiler/mod.rs
+1 −1 src/cargo/core/compiler/timings.rs
+28 −46 src/cargo/core/features.rs
+7 −5 src/cargo/util/machine_message.rs
+3 −3 src/doc/man/cargo-metadata.md
+8 −3 src/doc/man/cargo-pkgid.md
+3 −1 src/doc/man/generated_txt/cargo-metadata.txt
+9 −3 src/doc/man/generated_txt/cargo-pkgid.txt
+3 −3 src/doc/src/commands/cargo-metadata.md
+8 −3 src/doc/src/commands/cargo-pkgid.md
+7 −3 src/doc/src/reference/external-tools.md
+3 −3 src/etc/man/cargo-metadata.1
+6 −3 src/etc/man/cargo-pkgid.1
+1 −1 tests/testsuite/bench.rs
+1 −1 tests/testsuite/binary_name.rs
+8 −8 tests/testsuite/build.rs
+4 −4 tests/testsuite/doc.rs
+2 −2 tests/testsuite/install.rs
+3 −3 tests/testsuite/metabuild.rs
+3 −3 tests/testsuite/test.rs

0 comments on commit 41b6596

Please sign in to comment.