Skip to content

Commit

Permalink
Auto merge of #67961 - ehuss:update-cargo, r=alexcrichton
Browse files Browse the repository at this point in the history 
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)
  • Loading branch information
@bors
bors committed Jan 7, 2020
2 parents 4f074de + a30ee84 commit ee84c30
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 23 files
+2 −10 src/cargo/core/compiler/build_context/mod.rs
+1 −1 src/cargo/core/compiler/build_context/target_info.rs
+2 −81 src/cargo/core/compiler/custom_build.rs
+1 −1 src/cargo/core/compiler/fingerprint.rs
+0 −6 src/cargo/core/compiler/mod.rs
+7 −2 src/cargo/ops/cargo_output_metadata.rs
+17 −4 src/cargo/sources/config.rs
+2 −1 src/cargo/util/command_prelude.rs
+79 −36 src/cargo/util/config/de.rs
+20 −5 src/cargo/util/config/mod.rs
+98 −7 src/cargo/util/config/target.rs
+4 −0 src/cargo/util/config/value.rs
+1 −1 src/doc/src/reference/specifying-dependencies.md
+53 −2 tests/testsuite/bad_config.rs
+5 −0 tests/testsuite/build.rs
+76 −0 tests/testsuite/config.rs
+2 −3 tests/testsuite/cross_compile.rs
+6 −2 tests/testsuite/features.rs
+1 −0 tests/testsuite/main.rs
+110 −0 tests/testsuite/metadata.rs
+34 −0 tests/testsuite/pkgid.rs
+2 −3 tests/testsuite/plugins.rs
+33 −21 tests/testsuite/tool_paths.rs

0 comments on commit ee84c30

Please sign in to comment.