Skip to content

Commit

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

7 commits in 363a2d11320faf531f6aacd1ea067c6bc08343b9..ac6bbb33293d8d424c17ecdb42af3aac25fb7295
2023-12-22 03:12:42 +0000 to 2023-12-26 23:22:08 +0000
- docs: fix link to nightly doc of cargo-util-schemas (rust-lang/cargo#13209)
- doc: improve word usage (rust-lang/cargo#13206)
- fix: clarify `--path` is the installation source not destination (rust-lang/cargo#13205)
- refactor: give some better examples for package ID spec (rust-lang/cargo#13202)
- chore: fix a typo (rust-lang/cargo#13201)
- Extend the build directive syntax with `cargo::` (rust-lang/cargo#12201)
- Rework `--check-cfg` generation comment (rust-lang/cargo#13195)

r? ghost
  • Loading branch information
@bors
bors committed Dec 27, 2023
2 parents eee93d8 + eb84788 commit 0961661
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 33 files
+7 −5 crates/cargo-util-schemas/src/core/package_id_spec.rs
+1 −1 src/bin/cargo/cli.rs
+2 −2 src/bin/cargo/commands/install.rs
+168 −49 src/cargo/core/compiler/custom_build.rs
+1 −1 src/cargo/core/compiler/fingerprint/dirty_reason.rs
+18 −7 src/cargo/core/compiler/mod.rs
+1 −1 src/cargo/lib.rs
+2 −2 src/cargo/ops/cargo_install.rs
+3 −3 src/doc/man/cargo-install.md
+6 −5 src/doc/man/generated_txt/cargo-install.txt
+3 −3 src/doc/src/commands/cargo-install.md
+22 −22 src/doc/src/faq.md
+17 −17 src/doc/src/reference/build-script-examples.md
+46 −46 src/doc/src/reference/build-scripts.md
+4 −4 src/doc/src/reference/external-tools.md
+2 −2 src/doc/src/reference/unstable.md
+3 −3 src/etc/man/cargo-install.1
+6 −6 tests/testsuite/build.rs
+241 −80 tests/testsuite/build_script.rs
+4 −4 tests/testsuite/build_script_env.rs
+21 −21 tests/testsuite/build_script_extra_link_arg.rs
+1 −1 tests/testsuite/cargo/help/stdout.log
+2 −2 tests/testsuite/cargo_install/help/stdout.log
+9 −9 tests/testsuite/check_cfg.rs
+9 −3 tests/testsuite/cross_compile.rs
+1 −1 tests/testsuite/dep_info.rs
+1 −1 tests/testsuite/doc.rs
+6 −6 tests/testsuite/features2.rs
+10 −10 tests/testsuite/freshness.rs
+2 −2 tests/testsuite/install.rs
+2 −2 tests/testsuite/profile_overrides.rs
+7 −7 tests/testsuite/run.rs
+2 −2 tests/testsuite/warn_on_failure.rs

0 comments on commit 0961661

Please sign in to comment.