Skip to content

Commit

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

18 commits in e75214ea4936d2f2c909a71a1237042cc0e14b07..0310497822a7a673a330a5dd068b7aaa579a265e
2024-10-25 16:34:32 +0000 to 2024-11-01 19:27:56 +0000
- Add more metadata to `rustc_fingerprint` (rust-lang/cargo#14761)
- test(rustfix): switch to a simpler case for dedup-suggestions (rust-lang/cargo#14765)
- chore(deps): update rust crate security-framework to v3 (rust-lang/cargo#14766)
- chore(deps): update rust crate gix to 0.67.0 (rust-lang/cargo#14762)
- fix(util): Respect all `..`s in `normalize_path` (rust-lang/cargo#14750)
- test(doc): Resolve flaky test (rust-lang/cargo#14760)
- refactor(test): Remove dead 'expect_stdout_contains_n' check (rust-lang/cargo#14759)
- add unstable -Zroot-dir flag to configure the path from which rustc should be invoked (rust-lang/cargo#14752)
- docs(resolver): Further v3 prep (rust-lang/cargo#14753)
- fix: track version in fingerprint dep-info files (rust-lang/cargo#14751)
- test: Remove unused msrv-policy (rust-lang/cargo#14748)
- download targeted transitive deps of with artifact deps'  target platform (rust-lang/cargo#14723)
- Remove requirement for --target when invoking Cargo with -Zbuild-std (rust-lang/cargo#14317)
- docs(fingerprint): document the encoding of Cargo's depinfo (rust-lang/cargo#14745)
- Allow build scripts to report error messages through `cargo::error` (rust-lang/cargo#14743)
- fix(publish): Downgrade version-exists error to warning on dry-run (rust-lang/cargo#14742)
- fix: clean up for deprecated and removed commands (rust-lang/cargo#14739)
- Deprecate `cargo verify-project` (rust-lang/cargo#14736)
  • Loading branch information
@bors
bors committed Nov 2, 2024
2 parents 7c7bb7d + 65c7410 commit ef972a3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 56 files
+148 −149 Cargo.lock
+2 −2 Cargo.toml
+0 −34 crates/cargo-test-support/src/compare.rs
+6 −6 crates/cargo-test-support/src/lib.rs
+43 −2 crates/cargo-util/src/paths.rs
+5 −11 crates/rustfix/tests/everything/dedup-suggestions.fixed.rs
+323 −5 crates/rustfix/tests/everything/dedup-suggestions.json
+5 −11 crates/rustfix/tests/everything/dedup-suggestions.rs
+3 −1 src/bin/cargo/commands/git_checkout.rs
+5 −2 src/bin/cargo/commands/read_manifest.rs
+9 −4 src/bin/cargo/commands/verify_project.rs
+0 −5 src/cargo/core/compiler/build_config.rs
+64 −26 src/cargo/core/compiler/custom_build.rs
+758 −0 src/cargo/core/compiler/fingerprint/dep_info.rs
+14 −571 src/cargo/core/compiler/fingerprint/mod.rs
+30 −21 src/cargo/core/compiler/job_queue/mod.rs
+3 −0 src/cargo/core/features.rs
+39 −14 src/cargo/core/package.rs
+21 −7 src/cargo/ops/registry/publish.rs
+8 −1 src/cargo/util/rustc.rs
+9 −3 src/cargo/util/workspace.rs
+3 −0 src/doc/book.toml
+0 −58 src/doc/man/cargo-verify-project.md
+0 −3 src/doc/man/cargo.md
+0 −137 src/doc/man/generated_txt/cargo-verify-project.txt
+0 −3 src/doc/man/generated_txt/cargo.txt
+1 −1 src/doc/src/SUMMARY.md
+0 −154 src/doc/src/commands/cargo-verify-project.md
+0 −3 src/doc/src/commands/cargo.md
+10 −0 src/doc/src/commands/deprecated-and-removed.md
+1 −0 src/doc/src/commands/index.md
+0 −1 src/doc/src/commands/manifest-commands.md
+17 −2 src/doc/src/reference/build-scripts.md
+3 −1 src/doc/src/reference/resolver.md
+8 −5 src/doc/src/reference/unstable.md
+0 −8 src/etc/_cargo
+0 −2 src/etc/cargo.bashcomp.sh
+0 −178 src/etc/man/cargo-verify-project.1
+0 −4 src/etc/man/cargo.1
+60 −0 tests/build-std/main.rs
+17 −8 tests/testsuite/artifact_dep.rs
+244 −6 tests/testsuite/build_script.rs
+14 −12 tests/testsuite/cargo/z_help/stdout.term.svg
+1 −1 tests/testsuite/cargo_command.rs
+2 −2 tests/testsuite/cargo_read_manifest/help/stdout.term.svg
+18 −18 tests/testsuite/cargo_verify_project/help/stdout.term.svg
+80 −0 tests/testsuite/directory.rs
+2 −1 tests/testsuite/doc.rs
+30 −24 tests/testsuite/fix.rs
+4 −0 tests/testsuite/mock-std/dep_test/Cargo.toml
+1 −0 tests/testsuite/mock-std/dep_test/src/lib.rs
+1 −0 tests/testsuite/mock-std/library/std/Cargo.toml
+19 −0 tests/testsuite/publish.rs
+14 −28 tests/testsuite/rust_version.rs
+67 −0 tests/testsuite/standard_lib.rs
+25 −14 tests/testsuite/warn_on_failure.rs

0 comments on commit ef972a3

Please sign in to comment.