Skip to content

Commit

Permalink
Rollup merge of rust-lang#83910 - ehuss:update-cargo, r=ehuss
Browse files Browse the repository at this point in the history 
Update cargo

3 commits in 3c44c3c4b7900b8b13c85ead25ccaa8abb7d8989..65d57e6f384c2317f76626eac116f683e2b63665
2021-03-31 21:21:15 +0000 to 2021-04-04 15:07:52 +0000
- Fix typo in contrib docs. (rust-lang/cargo#9328)
- fix clippy warnings (rust-lang/cargo#9323)
- Add -Zallow-features to match rustc's -Z (rust-lang/cargo#9283)
  • Loading branch information
@Dylan-DPC
Dylan-DPC authored Apr 6, 2021
2 parents 38a8fa8 + 48c2cde commit 2f57dc8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 25 files
+1 −0 src/bin/cargo/cli.rs
+1 −2 src/cargo/core/compiler/build_context/target_info.rs
+12 −8 src/cargo/core/compiler/fingerprint.rs
+12 −1 src/cargo/core/compiler/mod.rs
+63 −23 src/cargo/core/features.rs
+1 −1 src/cargo/core/resolver/context.rs
+1 −1 src/cargo/core/resolver/dep_cache.rs
+2 −2 src/cargo/core/resolver/features.rs
+3 −3 src/cargo/core/resolver/mod.rs
+2 −2 src/cargo/core/workspace.rs
+6 −5 src/cargo/ops/cargo_compile.rs
+7 −7 src/cargo/ops/cargo_config.rs
+12 −14 src/cargo/ops/cargo_install.rs
+1 −1 src/cargo/ops/common_for_install_and_uninstall.rs
+3 −3 src/cargo/util/config/key.rs
+27 −0 src/cargo/util/mod.rs
+1 −1 src/doc/contrib/src/index.md
+26 −0 src/doc/src/reference/unstable.md
+1 −1 tests/testsuite/build_script.rs
+189 −1 tests/testsuite/cargo_features.rs
+2 −2 tests/testsuite/features2.rs
+1 −1 tests/testsuite/future_incompat_report.rs
+4 −4 tests/testsuite/metadata.rs
+2 −2 tests/testsuite/multitarget.rs
+1 −1 tests/testsuite/tree.rs

0 comments on commit 2f57dc8

Please sign in to comment.