Commit ee84c30
committed
Auto merge of rust-lang#67961 - ehuss:update-cargo, r=alexcrichton
Update cargo
9 commits in 86134e7666a088682f20b76278c3ee096a315218..6e1ca924a67dd1ac89c33f294ef26b5c43b89168
2019-12-23 16:08:07 +0000 to 2020-01-06 19:11:37 +0000
- Fix dynamic linking for Windows UWP MSVC targets (rust-lang/cargo#7758)
- Fix CARGO_TARGET_triple_LINKER environment variable. (rust-lang/cargo#7763)
- Remove metadata dep_kinds duplicates. (rust-lang/cargo#7756)
- Check for a source defined multiple times. (rust-lang/cargo#7751)
- Fix typo. (rust-lang/cargo#7735)
- Fix config env vars that are prefix of another with underscore. (rust-lang/cargo#7748)
- Add test for `cargo pkgid` (rust-lang/cargo#7741)
- Add a note to the error message for using --feature / --no-default-features in a virtual workspace (rust-lang/cargo#7742)
- Fix debug message. (rust-lang/cargo#7749)1 file changed
+1
-1
lines changed- src/cargo/core/compiler/build_context/mod.rs+2-10
- src/cargo/core/compiler/build_context/target_info.rs+1-1
- src/cargo/core/compiler/custom_build.rs+2-81
- src/cargo/core/compiler/fingerprint.rs+1-1
- src/cargo/core/compiler/mod.rs-6
- src/cargo/ops/cargo_output_metadata.rs+7-2
- src/cargo/sources/config.rs+17-4
- src/cargo/util/command_prelude.rs+2-1
- src/cargo/util/config/de.rs+79-36
- src/cargo/util/config/mod.rs+20-5
- src/cargo/util/config/target.rs+98-7
- src/cargo/util/config/value.rs+4
- src/doc/src/reference/specifying-dependencies.md+1-1
- tests/testsuite/bad_config.rs+53-2
- tests/testsuite/build.rs+5
- tests/testsuite/config.rs+76
- tests/testsuite/cross_compile.rs+2-3
- tests/testsuite/features.rs+6-2
- tests/testsuite/main.rs+1
- tests/testsuite/metadata.rs+110
- tests/testsuite/pkgid.rs+34
- tests/testsuite/plugins.rs+2-3
- tests/testsuite/tool_paths.rs+33-21
0 commit comments