Skip to content

Commit

Permalink
Auto merge of #69265 - ehuss:update-cargo, r=Dylan-DPC
Browse files Browse the repository at this point in the history 
Update cargo

9 commits in 3c53211c3d7fee4f430f170115af5baad17a3da9..e02974078a692d7484f510eaec0e88d1b6cc0203
2020-02-07 15:35:03 +0000 to 2020-02-18 15:24:43 +0000
- Set an environment variable for tests to find executables. (rust-lang/cargo#7697)
- Rework internal errors. (rust-lang/cargo#7896)
- Improvements to StringList config handling. (rust-lang/cargo#7891)
- Add new/old rustflags to fingerprint log. (rust-lang/cargo#7890)
- Fix inaccurate doc comment on `env_args`. (rust-lang/cargo#7889)
- Add some extra fingerprint debug information. (rust-lang/cargo#7888)
- Link the licenses into crates/cargo-platform (rust-lang/cargo#7886)
- Modify test to make `rustc` PR mergeable (rust-lang/cargo#7883)
- Keep environment variables in a BTreeMap to preserve sort order (rust-lang/cargo#7877)
  • Loading branch information
@bors
bors committed Feb 19, 2020
2 parents 3a8108d + 597b4f7 commit ae54678
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 39 files
+1 −0 crates/cargo-platform/LICENSE-APACHE
+1 −0 crates/cargo-platform/LICENSE-MIT
+1 −1 crates/cargo-test-support/src/lib.rs
+3 −3 src/cargo/core/compiler/build_context/target_info.rs
+31 −1 src/cargo/core/compiler/context/compilation_files.rs
+3 −3 src/cargo/core/compiler/context/mod.rs
+2 −6 src/cargo/core/compiler/custom_build.rs
+32 −12 src/cargo/core/compiler/fingerprint.rs
+1 −2 src/cargo/core/compiler/job_queue.rs
+22 −6 src/cargo/core/compiler/mod.rs
+2 −2 src/cargo/core/compiler/output_depinfo.rs
+5 −0 src/cargo/core/shell.rs
+43 −47 src/cargo/lib.rs
+1 −1 src/cargo/ops/cargo_install.rs
+5 −0 src/cargo/ops/cargo_new.rs
+7 −10 src/cargo/ops/cargo_package.rs
+1 −1 src/cargo/ops/cargo_uninstall.rs
+6 −6 src/cargo/sources/git/utils.rs
+13 −6 src/cargo/sources/path.rs
+2 −2 src/cargo/sources/registry/mod.rs
+19 −31 src/cargo/util/config/de.rs
+70 −38 src/cargo/util/config/mod.rs
+1 −1 src/cargo/util/config/path.rs
+77 −19 src/cargo/util/errors.rs
+13 −18 src/cargo/util/paths.rs
+4 −4 src/cargo/util/process_builder.rs
+5 −3 src/cargo/util/rustc.rs
+8 −0 src/doc/man/cargo-test.adoc
+9 −0 src/doc/man/generated/cargo-test.html
+9 −0 src/doc/src/reference/cargo-targets.md
+10 −0 src/doc/src/reference/environment-variables.md
+12 −2 src/etc/man/cargo-test.1
+3 −2 tests/testsuite/bad_config.rs
+1 −1 tests/testsuite/check.rs
+53 −0 tests/testsuite/config.rs
+19 −0 tests/testsuite/error.rs
+1 −0 tests/testsuite/main.rs
+47 −0 tests/testsuite/test.rs
+19 −0 tests/testsuite/tool_paths.rs

0 comments on commit ae54678

Please sign in to comment.