Commit 95bbcdb
authored
Rollup merge of rust-lang#83219 - ehuss:update-cargo, r=ehuss
Update cargo
8 commits in 32da9eaa5de5be241cf8096ca6b749a157194f77..90691f2bfe9a50291a98983b1ed2feab51d5ca55
2021-03-13 01:18:40 +0000 to 2021-03-16 21:36:55 +0000
- Add report if `cargo fix --edition` changes features. (rust-lang/cargo#9268)
- Fix --feature pkg/feat for V1 resolver for non-member. (rust-lang/cargo#9275)
- Fix doc duplicate removal of root units. (rust-lang/cargo#9276)
- Add CLI help text for patch-in-config (rust-lang/cargo#9271)
- Document `-Zpatch-in-config` (rust-lang/cargo#9270)
- Support [patch] in .cargo/config files (rust-lang/cargo#9204)
- Add `--future-incompat-report` support to `cargo test` (rust-lang/cargo#9264)
- 🍱 Crop favicon (rust-lang/cargo#9262)1 file changed
+1
-1
lines changed- src/bin/cargo/cli.rs+1
- src/bin/cargo/commands/test.rs+1
- src/cargo/core/features.rs+2
- src/cargo/core/mod.rs+1-1
- src/cargo/core/resolver/encode.rs+4-4
- src/cargo/core/resolver/features.rs+78-6
- src/cargo/core/workspace.rs+100-8
- src/cargo/ops/cargo_compile.rs+19-10
- src/cargo/ops/fix.rs+110-1
- src/cargo/ops/resolve.rs+6-4
- src/cargo/util/toml/mod.rs+89-15
- src/doc/src/reference/unstable.md+25
- src/doc/theme/favicon.png
- tests/testsuite/collisions.rs+66
- tests/testsuite/fix.rs+61
- tests/testsuite/future_incompat_report.rs+2-2
- tests/testsuite/package_features.rs+31
- tests/testsuite/patch.rs+305
0 commit comments