Commit 2b285cd
committed
Auto merge of rust-lang#138200 - weihanglo:update-cargo, r=weihanglo
Update cargo
22 commits in 2622e844bc1e2e6123e54e94e4706f7b6195ce3d..ab1463d632528e39daf35f263e10c14cbe590ce8
2025-02-28 12:33:57 +0000 to 2025-03-08 01:45:05 +0000
- test: redact host target when comparing CARGO_ENV path (rust-lang/cargo#15279)
- feat: add completions for install --path (rust-lang/cargo#15266)
- fix(package): report lockfile / workspace manifest is dirty (rust-lang/cargo#15276)
- feat(tree): Add `--depth public` behind `-Zunstable-options` (rust-lang/cargo#15243)
- Don't use `$CARGO_BUILD_TARGET` in `cargo metadata` (rust-lang/cargo#15271)
- feat: show extra build description from bootstrap (rust-lang/cargo#15269)
- Upgrade to `rustc-stable-hash v0.1.2` (rust-lang/cargo#15268)
- fix: Respect --frozen everywhere --offline or --locked is accepted (rust-lang/cargo#15263)
- feat(tree): Color the output (rust-lang/cargo#15242)
- fix(vendor): dont remove non-cached source (rust-lang/cargo#15260)
- docs: lockfile is always included since 1.84 (rust-lang/cargo#15257)
- Remove `Cargo.toml` from `package.include` in example (rust-lang/cargo#15253)
- Small cleanup: remove unneeded result (rust-lang/cargo#15256)
- Fix typo in build-scripts.md (rust-lang/cargo#15254)
- chore(deps): update rust crate pulldown-cmark to 0.13.0 (rust-lang/cargo#15250)
- chore(deps): update compatible (rust-lang/cargo#15249)
- feat(cli): forward bash completions of third party subcommands (rust-lang/cargo#15247)
- feat: add completions for `--lockfile-path` (rust-lang/cargo#15238)
- fix: reset $CARGO if the running program is real `cargo[.exe]` (rust-lang/cargo#15208)
- Get all members as `available targets` even though default-members was specified. (rust-lang/cargo#15199)
- refactor: control byte display precision with std::fmt options (rust-lang/cargo#15246)
- fix(package): Ensure we can package directories ending with '.rs' (rust-lang/cargo#15240)2 files changed
+1
-2
lines changed- Cargo.lock+38-45
- Cargo.toml+2-4
- crates/mdman/src/format/man.rs+9-2
- crates/mdman/src/format/text.rs+9-2
- src/bin/cargo/commands/install.rs+5-1
- src/bin/cargo/commands/vendor.rs+3-1
- src/cargo/core/compiler/compile_kind.rs+34-3
- src/cargo/core/compiler/job_queue/job_state.rs+1-2
- src/cargo/core/compiler/mod.rs+3-3
- src/cargo/core/package.rs+10-8
- src/cargo/core/resolver/errors.rs+3-3
- src/cargo/ops/cargo_add/mod.rs+2-2
- src/cargo/ops/cargo_clean.rs+4-8
- src/cargo/ops/cargo_compile/mod.rs+1
- src/cargo/ops/cargo_compile/unit_generator.rs+86-16
- src/cargo/ops/cargo_install.rs+1-1
- src/cargo/ops/cargo_output_metadata.rs+11-3
- src/cargo/ops/cargo_package/mod.rs+5-8
- src/cargo/ops/cargo_package/vcs.rs+62-17
- src/cargo/ops/lockfile.rs+3-8
- src/cargo/ops/registry/info/mod.rs+2-6
- src/cargo/ops/tree/graph.rs+18-1
- src/cargo/ops/tree/mod.rs+68-25
- src/cargo/ops/vendor.rs+47-5
- src/cargo/sources/git/oxide.rs+4-3
- src/cargo/sources/git/source.rs+11-5
- src/cargo/sources/git/utils.rs+6-10
- src/cargo/sources/registry/http_remote.rs+2-2
- src/cargo/sources/registry/index/mod.rs+1-1
- src/cargo/sources/registry/remote.rs+1-1
- src/cargo/util/command_prelude.rs+12-1
- src/cargo/util/context/mod.rs+38-14
- src/cargo/util/mod.rs+41-29
- src/cargo/util/network/http.rs+2-8
- src/cargo/util/toml/mod.rs+3-2
- src/cargo/version.rs+18
- src/doc/src/reference/build-scripts.md+1-1
- src/doc/src/reference/manifest.md+2-2
- src/doc/src/reference/publishing.md+1-2
- src/etc/cargo.bashcomp.sh+9-2
- tests/testsuite/build.rs+6-6
- tests/testsuite/cargo_command.rs+91-1
- tests/testsuite/cargo_tree/deps.rs+133-1
- tests/testsuite/cargo_tree/dupe/mod.rs+36
- tests/testsuite/cargo_tree/dupe/stderr.term.svg+37
- tests/testsuite/cargo_tree/dupe/stdout.term.svg+35
- tests/testsuite/cargo_tree/edge_kind/mod.rs+100
- tests/testsuite/cargo_tree/edge_kind/stderr.term.svg+67
- tests/testsuite/cargo_tree/edge_kind/stdout.term.svg+112
- tests/testsuite/cargo_tree/features.rs+161
- tests/testsuite/cargo_tree/mod.rs+4
- tests/testsuite/main.rs-2
- tests/testsuite/metadata.rs+38-7
- tests/testsuite/offline.rs+7-7
- tests/testsuite/package.rs+208-18
- tests/testsuite/progress.rs+2-2
- tests/testsuite/registry.rs+8-21
- tests/testsuite/run.rs+6-6
- tests/testsuite/script.rs+1-1
- tests/testsuite/test.rs+13-13
- tests/testsuite/vendor.rs+42
- tests/testsuite/workspaces.rs+149
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
126 | | - | |
127 | 126 | | |
128 | 127 | | |
129 | 128 | | |
| |||
0 commit comments