Skip to content

Commit

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

7 commits in 0ca60e940821c311c9b25a6423b59ccdbcea218f..4de0094ac78743d2c8ff682489e35c8a7cafe8e4
2024-05-08 01:54:25 +0000 to 2024-05-09 16:09:22 +0000
- Fix docs for unstable script feature (rust-lang/cargo#13893)
- Refactor cargo lint tests (rust-lang/cargo#13880)
- test(rustfix): run some tests only on nightly (rust-lang/cargo#13890)
- Old syntax suggestion (rust-lang/cargo#13874)
- docs: clarify dash replacement rule in target name (rust-lang/cargo#13887)
- Add local-only build scripts example in check-cfg docs (rust-lang/cargo#13884)
- docs(changelog): also mention `--message-format=json` (rust-lang/cargo#13882)

r? ghost
  • Loading branch information
@bors
bors committed May 11, 2024
2 parents f9a3fd9 + 27197ef commit ef15976
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 42 files
+15 −14 CHANGELOG.md
+1 −1 Cargo.lock
+1 −1 crates/rustfix/Cargo.toml
+1 −1 crates/rustfix/tests/everything/multiple-solutions.nightly.fixed.rs
+58 −6 crates/rustfix/tests/everything/multiple-solutions.nightly.json
+0 −0 crates/rustfix/tests/everything/multiple-solutions.nightly.rs
+33 −0 crates/rustfix/tests/parse_and_replace.rs
+21 −5 src/cargo/core/compiler/custom_build.rs
+3 −1 src/doc/man/cargo-metadata.md
+3 −1 src/doc/man/generated_txt/cargo-metadata.txt
+3 −1 src/doc/src/commands/cargo-metadata.md
+26 −0 src/doc/src/reference/build-scripts.md
+7 −6 src/doc/src/reference/cargo-targets.md
+5 −3 src/doc/src/reference/external-tools.md
+3 −3 src/doc/src/reference/unstable.md
+3 −1 src/etc/man/cargo-metadata.1
+91 −9 tests/testsuite/build_script.rs
+12 −13 tests/testsuite/lints/error/mod.rs
+41 −0 tests/testsuite/lints/error/stderr.term.svg
+137 −0 tests/testsuite/lints/implicit_features.rs
+0 −32 tests/testsuite/lints/implicit_features/edition_2021/mod.rs
+0 −33 tests/testsuite/lints/implicit_features/edition_2021/stderr.term.svg
+0 −45 tests/testsuite/lints/implicit_features/edition_2021_warn/mod.rs
+0 −74 tests/testsuite/lints/implicit_features/edition_2021_warn/stderr.term.svg
+0 −43 tests/testsuite/lints/implicit_features/edition_2024/mod.rs
+0 −33 tests/testsuite/lints/implicit_features/edition_2024/stderr.term.svg
+0 −3 tests/testsuite/lints/implicit_features/mod.rs
+3 −3 tests/testsuite/lints/inherited/mod.rs
+10 −12 tests/testsuite/lints/inherited/stderr.term.svg
+330 −0 tests/testsuite/lints/mod.rs
+91 −0 tests/testsuite/lints/unknown_lints.rs
+0 −2 tests/testsuite/lints/unknown_lints/mod.rs
+159 −0 tests/testsuite/lints/unused_optional_dependencies.rs
+0 −33 tests/testsuite/lints/unused_optional_dependencies/edition_2021/stderr.term.svg
+0 −56 tests/testsuite/lints/unused_optional_dependencies/edition_2024/mod.rs
+0 −77 tests/testsuite/lints/unused_optional_dependencies/edition_2024/stderr.term.svg
+0 −3 tests/testsuite/lints/unused_optional_dependencies/mod.rs
+0 −43 tests/testsuite/lints/unused_optional_dependencies/renamed_deps/mod.rs
+0 −77 tests/testsuite/lints/unused_optional_dependencies/renamed_deps/stderr.term.svg
+6 −3 tests/testsuite/lints/warning/mod.rs
+4 −5 tests/testsuite/lints/warning/stderr.term.svg
+0 −324 tests/testsuite/lints_table.rs

0 comments on commit ef15976

Please sign in to comment.