Skip to content

Commit

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

11 commits in ac6bbb33293d8d424c17ecdb42af3aac25fb7295..add15366eaf3f3eb84717d3b8b71902ca36a7c84
2023-12-26 23:22:08 +0000 to 2024-01-02 03:24:42 +0000
- chore(deps): update gix (rust-lang/cargo#13230)
- chore(deps): update alpine docker tag to v3.19 (rust-lang/cargo#13228)
- rustfix: Support inserting new lines. (rust-lang/cargo#13226)
- Fix fix::fix_in_dependency to not rely on rustc (rust-lang/cargo#13220)
- cleanup: Remove error-format special-case in `cargo fix` (rust-lang/cargo#13224)
- `cargo fix`: always inherit the jobserver (rust-lang/cargo#13225)
- Bump cargo-credential to 0.4.3 (rust-lang/cargo#13221)
- `cargo add` - fix for adding features from repository with multiple packages. (rust-lang/cargo#13213)
- Remove repetitive words (rust-lang/cargo#13216)
- Add cargo:rustc-cdylib-link-arg into RESERVED_PREFIXES list (rust-lang/cargo#13212)
- chore(doc): doc for custom subcommands look up. (rust-lang/cargo#13203)
  • Loading branch information
@bors
bors committed Jan 3, 2024
2 parents 2e79c8d + dcc043a commit 1a47f5b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 26 files
+133 −143 Cargo.lock
+3 −3 Cargo.toml
+1 −1 crates/cargo-test-support/containers/sshd/Dockerfile
+1 −1 crates/rustfix/Cargo.toml
+6 −60 crates/rustfix/src/lib.rs
+9 −0 crates/rustfix/tests/everything/use-insert.fixed.rs
+3 −0 crates/rustfix/tests/everything/use-insert.json
+7 −0 crates/rustfix/tests/everything/use-insert.rs
+42 −30 crates/rustfix/tests/parse_and_replace.rs
+1 −1 credential/cargo-credential/Cargo.toml
+1 −1 credential/cargo-credential/examples/stdout-redirected.rs
+1 −1 credential/cargo-credential/tests/examples.rs
+1 −0 src/cargo/core/compiler/custom_build.rs
+1 −1 src/cargo/ops/cargo_add/mod.rs
+9 −33 src/cargo/ops/fix.rs
+1 −1 src/cargo/sources/registry/mod.rs
+4 −0 src/doc/src/reference/external-tools.md
+1 −1 src/doc/src/reference/specifying-dependencies.md
+1 −0 tests/testsuite/cargo_add/git_multiple_packages_features/in
+63 −0 tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs
+8 −0 tests/testsuite/cargo_add/git_multiple_packages_features/out/Cargo.toml
+5 −0 tests/testsuite/cargo_add/git_multiple_packages_features/stderr.log
+0 −0 tests/testsuite/cargo_add/git_multiple_packages_features/stdout.log
+1 −0 tests/testsuite/cargo_add/mod.rs
+154 −3 tests/testsuite/fix.rs
+1 −1 tests/testsuite/global_cache_tracker.rs

0 comments on commit 1a47f5b

Please sign in to comment.