Commit bfe6f87
authored
Rollup merge of rust-lang#96031 - ehuss:update-cargo, r=ehuss
Update cargo
11 commits in e2e2dddebe66dfc1403a312653557e332445308b..dba5baf4345858c591517b24801902a062c399f8
2022-04-05 17:04:53 +0000 to 2022-04-13 21:58:27 +0000
- Part 6 of RFC2906 - Switch the inheritance source from `workspace` to… (rust-lang/cargo#10564)
- Part 5 of RFC2906 - Add support for inheriting `rust-version` (rust-lang/cargo#10563)
- Add support for rustc --check-cfg well known names and values (rust-lang/cargo#10486)
- Reserve filename `Cargo.toml.orig` in `cargo package` (rust-lang/cargo#10551)
- Retry command invocation with argfile (rust-lang/cargo#10546)
- Add a progress indicator for `cargo clean` (rust-lang/cargo#10236)
- Ensure host units don't depend on Docscrape units, fixes rust-lang/cargo#10545 (rust-lang/cargo#10549)
- Fix docs: Bindeps env vars are passed to build script at runtime (rust-lang/cargo#10550)
- Part 4 of RFC2906 - Add support for inheriting `readme` (rust-lang/cargo#10548)
- Part 3 of RFC2906 - Add support for inheriting `license-path`, and `depednency.path` (rust-lang/cargo#10538)
- Bump to 0.63.0, update changelog (rust-lang/cargo#10544)2 files changed
+6
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
311 | 311 | | |
312 | 312 | | |
313 | 313 | | |
314 | | - | |
| 314 | + | |
315 | 315 | | |
316 | 316 | | |
317 | 317 | | |
| |||
348 | 348 | | |
349 | 349 | | |
350 | 350 | | |
| 351 | + | |
351 | 352 | | |
352 | 353 | | |
353 | 354 | | |
| |||
453 | 454 | | |
454 | 455 | | |
455 | 456 | | |
456 | | - | |
| 457 | + | |
457 | 458 | | |
458 | 459 | | |
459 | 460 | | |
| |||
2651 | 2652 | | |
2652 | 2653 | | |
2653 | 2654 | | |
2654 | | - | |
| 2655 | + | |
2655 | 2656 | | |
2656 | | - | |
| 2657 | + | |
2657 | 2658 | | |
2658 | 2659 | | |
2659 | 2660 | | |
| |||
- .github/workflows/main.yml+7
- CHANGELOG.md+65-1
- Cargo.toml+3-2
- crates/cargo-test-support/src/tools.rs+10-1
- crates/cargo-util/Cargo.toml+1-1
- crates/cargo-util/src/process_builder.rs+293-50
- crates/cargo-util/src/process_error.rs+7
- src/cargo/core/compiler/build_plan.rs+1-1
- src/cargo/core/compiler/compilation.rs+1
- src/cargo/core/compiler/context/mod.rs+1
- src/cargo/core/compiler/mod.rs+32-6
- src/cargo/core/compiler/unit_dependencies.rs+2-2
- src/cargo/core/features.rs+4
- src/cargo/core/mod.rs+2-1
- src/cargo/core/workspace.rs+36-186
- src/cargo/ops/cargo_clean.rs+135-28
- src/cargo/ops/cargo_package.rs+74-46
- src/cargo/ops/fix.rs+118-55
- src/cargo/util/rustc.rs+12-9
- src/cargo/util/toml/mod.rs+291-67
- src/doc/src/reference/unstable.md+28-2
- tests/testsuite/build.rs+86
- tests/testsuite/check.rs+50
- tests/testsuite/doc.rs+52
- tests/testsuite/fix.rs+13
- tests/testsuite/inheritable_workspace_fields.rs+82-11
- tests/testsuite/package.rs+39
- tests/testsuite/rustdocflags.rs+1
- tests/testsuite/test.rs+106
0 commit comments