Skip to content

Commit

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

8 commits in cebef2951ee69617852844894164b54ed478a7da..d21c22870e58499d6c31f1bef3bf1255eb021666
2021-07-22 13:01:52 +0000 to 2021-07-26 20:23:21 +0000
- Fix version string. (rust-lang/cargo#9727)
- Allow publishing from workspace root. (rust-lang/cargo#9559)
- Better msg for wrong position (rust-lang/cargo#9723)
- Stabilize the rustc-link-arg option (rust-lang/cargo#9557)
- Warning when using features in replace (rust-lang/cargo#9681)
- Refactor if let chains to matches! macro (rust-lang/cargo#9721)
- Weather is not nice today.. (rust-lang/cargo#9720)
- Update should_use_metadata function (rust-lang/cargo#9653)
  • Loading branch information
@JohnTitor
JohnTitor authored Jul 27, 2021
2 parents 54367b9 + 38663c0 commit bea8af9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 24 files
+1 −1 crates/resolver-tests/tests/resolve.rs
+1 −2 src/bin/cargo/cli.rs
+9 −0 src/bin/cargo/commands/package.rs
+2 −0 src/bin/cargo/commands/publish.rs
+9 −15 src/cargo/core/compiler/context/compilation_files.rs
+35 −56 src/cargo/core/compiler/custom_build.rs
+4 −2 src/cargo/core/features.rs
+1 −1 src/cargo/core/resolver/context.rs
+7 −19 src/cargo/core/resolver/types.rs
+70 −24 src/cargo/ops/cargo_package.rs
+1 −1 src/cargo/ops/mod.rs
+11 −6 src/cargo/ops/registry.rs
+10 −0 src/cargo/ops/resolve.rs
+7 −24 src/cargo/util/config/target.rs
+1 −1 src/cargo/util/toml/mod.rs
+38 −0 src/doc/src/reference/build-scripts.md
+7 −46 src/doc/src/reference/unstable.md
+8 −29 tests/testsuite/build_script_extra_link_arg.rs
+1 −1 tests/testsuite/cargo_features.rs
+3 −3 tests/testsuite/freshness.rs
+56 −0 tests/testsuite/package.rs
+96 −0 tests/testsuite/publish.rs
+98 −0 tests/testsuite/replace.rs
+2 −2 tests/testsuite/version.rs

0 comments on commit bea8af9

Please sign in to comment.