Skip to content

Commit

Permalink
Rollup merge of rust-lang#83219 - ehuss:update-cargo, r=ehuss
Browse files Browse the repository at this point in the history 
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)
  • Loading branch information
@JohnTitor
JohnTitor committed Mar 17, 2021
2 parents ab83b4f + 65c0110 commit 95bbcdb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 18 files
+1 −0 src/bin/cargo/cli.rs
+1 −0 src/bin/cargo/commands/test.rs
+2 −0 src/cargo/core/features.rs
+1 −1 src/cargo/core/mod.rs
+4 −4 src/cargo/core/resolver/encode.rs
+78 −6 src/cargo/core/resolver/features.rs
+100 −8 src/cargo/core/workspace.rs
+19 −10 src/cargo/ops/cargo_compile.rs
+110 −1 src/cargo/ops/fix.rs
+6 −4 src/cargo/ops/resolve.rs
+89 −15 src/cargo/util/toml/mod.rs
+25 −0 src/doc/src/reference/unstable.md
+ − src/doc/theme/favicon.png
+66 −0 tests/testsuite/collisions.rs
+61 −0 tests/testsuite/fix.rs
+2 −2 tests/testsuite/future_incompat_report.rs
+31 −0 tests/testsuite/package_features.rs
+305 −0 tests/testsuite/patch.rs

0 comments on commit 95bbcdb

Please sign in to comment.