Skip to content

Commit

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

9 commits in 089cbb80b73ba242efdcf5430e89f63fa3b5328d..c26576f9adddd254b3dd63aecba176434290a9f6
2020-06-15 14:38:34 +0000 to 2020-06-23 16:21:21 +0000
- Adding environment variable CARGO_PKG_LICENSE_FILE (rust-lang/cargo#8387)
- Enable "--target-dir" in "cargo install" (rust-lang/cargo#8391)
- Add support for `workspace.metadata` table (rust-lang/cargo#8323)
- Fix overzealous `clean -p` for reserved names. (rust-lang/cargo#8398)
- Fix order-dependent feature resolution. (rust-lang/cargo#8395)
- Correct mispelling of `cargo`. (rust-lang/cargo#8389)
- Add missing license field. (rust-lang/cargo#8386)
- Adding environment variable CARGO_PKG_LICENSE (rust-lang/cargo#8325)
- Cut down on data fetch from git dependencies (rust-lang/cargo#8363)
  • Loading branch information
@bors
bors committed Jun 24, 2020
2 parents 3c90ae8 + 7b9b580 commit 0b66a89
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 29 files
+1 −0 crates/cargo-test-support/Cargo.toml
+1 −0 src/bin/cargo/commands/install.rs
+8 −0 src/cargo/core/compiler/compilation.rs
+1 −0 src/cargo/core/compiler/standard_lib.rs
+3 −5 src/cargo/core/resolver/dep_cache.rs
+49 −25 src/cargo/core/workspace.rs
+15 −10 src/cargo/ops/cargo_clean.rs
+2 −0 src/cargo/ops/cargo_output_metadata.rs
+1 −1 src/cargo/sources/git/mod.rs
+64 −47 src/cargo/sources/git/source.rs
+179 −140 src/cargo/sources/git/utils.rs
+9 −5 src/cargo/sources/registry/remote.rs
+1 −1 src/cargo/util/job.rs
+3 −0 src/cargo/util/toml/mod.rs
+2 −0 src/doc/man/cargo-install.adoc
+9 −0 src/doc/man/cargo-metadata.adoc
+7 −0 src/doc/man/generated/cargo-install.html
+2 −0 src/doc/src/reference/environment-variables.md
+9 −0 src/doc/src/reference/manifest.md
+24 −0 src/doc/src/reference/workspaces.md
+12 −2 src/etc/man/cargo-install.1
+6 −3 tests/testsuite/alt_registry.rs
+42 −0 tests/testsuite/build.rs
+52 −0 tests/testsuite/clean.rs
+78 −1 tests/testsuite/features.rs
+4 −2 tests/testsuite/git.rs
+29 −0 tests/testsuite/install.rs
+58 −21 tests/testsuite/metadata.rs
+2 −1 tests/testsuite/update.rs

0 comments on commit 0b66a89

Please sign in to comment.