Skip to content

Commit

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

10 commits in 2af662e22177a839763ac8fb70d245a680b15214..bfca1cd22bf514d5f2b6c1089b0ded0ba7dfaa6e
2020-11-12 19:04:56 +0000 to 2020-11-24 16:33:21 +0000
- Shrink the progress bar, to give more space after it. (rust-lang/cargo#8892)
- Add some comments to the toml code (rust-lang/cargo#8887)
- Start searching git config at new path (rust-lang/cargo#8886)
- Fix documentation for CARGO_PRIMARY_PACKAGE. (rust-lang/cargo#8891)
- Bump to 0.51.0, update changelog (rust-lang/cargo#8894)
- Publish target's "doc" setting when emitting metadata (rust-lang/cargo#8869)
- Relaxes expectation of `cargo test` tests to accept test execution time (rust-lang/cargo#8884)
- Finish implementation of `-Zextra-link-arg`. (rust-lang/cargo#8441)
- Reproducible crate builds (rust-lang/cargo#8864)
- Allow resolver="1" to explicitly use the old resolver behavior. (rust-lang/cargo#8857)
  • Loading branch information
@bors
bors committed Nov 24, 2020
2 parents 25a6910 + c46e896 commit 7445993
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ checksum = "81a18687293a1546b67c246452202bbbf143d239cb43494cc163da14979082da"

[[package]]
name = "cargo"
version = "0.50.0"
version = "0.51.0"
dependencies = [
"anyhow",
"atty",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 37 files
+66 −2 CHANGELOG.md
+1 −1 Cargo.toml
+35 −5 src/cargo/core/compiler/custom_build.rs
+37 −7 src/cargo/core/compiler/mod.rs
+2 −0 src/cargo/core/features.rs
+6 −0 src/cargo/core/manifest.rs
+2 −1 src/cargo/core/resolver/types.rs
+2 −0 src/cargo/core/source/source_id.rs
+10 −13 src/cargo/ops/cargo_new.rs
+2 −9 src/cargo/ops/cargo_package.rs
+32 −4 src/cargo/util/config/target.rs
+3 −1 src/cargo/util/progress.rs
+24 −0 src/cargo/util/toml/mod.rs
+2 −0 src/doc/man/cargo-metadata.md
+2 −0 src/doc/man/generated_txt/cargo-metadata.txt
+2 −0 src/doc/src/commands/cargo-metadata.md
+7 −7 src/doc/src/reference/environment-variables.md
+35 −3 src/doc/src/reference/unstable.md
+2 −0 src/etc/man/cargo-metadata.1
+1 −0 tests/testsuite/bench.rs
+7 −0 tests/testsuite/build.rs
+72 −0 tests/testsuite/build_script_extra_link_arg.rs
+3 −3 tests/testsuite/dep_info.rs
+0 −12 tests/testsuite/doc.rs
+57 −2 tests/testsuite/features2.rs
+1 −0 tests/testsuite/main.rs
+2 −0 tests/testsuite/metabuild.rs
+33 −0 tests/testsuite/metadata.rs
+45 −1 tests/testsuite/new.rs
+36 −0 tests/testsuite/package.rs
+2 −8 tests/testsuite/profiles.rs
+2 −0 tests/testsuite/pub_priv.rs
+1 −0 tests/testsuite/read_manifest.rs
+3 −0 tests/testsuite/required_features.rs
+16 −13 tests/testsuite/test.rs
+4 −0 tests/testsuite/unit_graph.rs
+2 −0 tests/testsuite/update.rs

0 comments on commit 7445993

Please sign in to comment.