Skip to content

Commit

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

5 commits in 045bf21b36a2e1f3ed85e38278d1c3cc4305e134..cecde95c119a456c30e57d3e4b31fff5a7d83df4
2025-01-17 14:59:36 +0000 to 2025-01-24 17:15:24 +0000
- Remove unused `-C link-arg=-fuse-ld=lld` (rust-lang/cargo#15097)
- Remove `unsafe` by using `LazyLock` (rust-lang/cargo#15096)
- Print globs when workspace members can't be found (rust-lang/cargo#15093)
- Make --allow-dirty imply --allow-staged (rust-lang/cargo#15013)
- fix(config): When merging, replace rather than combining specific configuration keys (rust-lang/cargo#15066)
  • Loading branch information
@bors
bors committed Jan 25, 2025
2 parents 814ebca + 06e9102 commit 1fc3491
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 18 files
+14 −16 crates/cargo-test-macro/src/lib.rs
+5 −3 src/bin/cargo/commands/fix.rs
+25 −13 src/cargo/core/workspace.rs
+1 −1 src/cargo/ops/fix.rs
+6 −10 src/cargo/util/context/de.rs
+10 −0 src/cargo/util/context/key.rs
+43 −28 src/cargo/util/context/mod.rs
+6 −2 src/cargo/util/context/path.rs
+1 −1 src/doc/man/cargo-fix.md
+2 −1 src/doc/man/generated_txt/cargo-fix.txt
+1 −1 src/doc/src/commands/cargo-fix.md
+1 −1 src/etc/man/cargo-fix.1
+56 −54 tests/testsuite/cargo_fix/help/stdout.term.svg
+32 −0 tests/testsuite/config.rs
+3 −3 tests/testsuite/fix.rs
+0 −1 tests/testsuite/freshness.rs
+0 −1 tests/testsuite/freshness_checksum.rs
+3 −3 tests/testsuite/workspaces.rs

0 comments on commit 1fc3491

Please sign in to comment.