Skip to content

Commit

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

9 commits in 26092da337b948719549cd5ed3d1051fd847afd7..42a8c0adf91323c01228268c651aef5366b25b69
2019-07-31 23:24:32 +0000 to 2019-08-07 20:41:07 +0000
- Add support for customizing JSON diagnostics from Cargo (rust-lang/cargo#7214)
- Bump rustfix (rust-lang/cargo#7221)
- Fix remap-path-prefix from failing. (rust-lang/cargo#7219)
- Clean up build script stuff and documentation. (rust-lang/cargo#7215)
- Remove debug panic in package-features. (rust-lang/cargo#7213)
- Fix an old test. (rust-lang/cargo#7208)
- Remove unused AstBuilder (rust-lang/cargo#7210)
- Revert "Release a jobserver token while locking a file" (rust-lang/cargo#7201)
- improve error message for unmatched prerelease dependencies (rust-lang/cargo#7191)
  • Loading branch information
@bors
bors committed Aug 8, 2019
2 parents 476af31 + 266fa0c commit db7c773
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
11 changes: 5 additions & 6 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ dependencies = [
"pretty_env_logger 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-workspace-hack 1.0.0",
"rustfix 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"rustfix 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -477,7 +477,7 @@ dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rustfix 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"rustfix 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
"walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
Expand All @@ -496,7 +496,7 @@ dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rustfix 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"rustfix 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -3263,13 +3263,12 @@ dependencies = [

[[package]]
name = "rustfix"
version = "0.4.4"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
]

Expand Down Expand Up @@ -4600,7 +4599,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
"checksum rustc_tools_util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b725dadae9fabc488df69a287f5a99c5eaf5d10853842a8a3dfac52476f544ee"
"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
"checksum rustfix 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "af7c21531a91512a4a51b490be6ba1c8eff34fdda0dc5bf87dc28d86748aac56"
"checksum rustfix 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7150ac777a2931a53489f5a41eb0937b84e3092a20cd0e73ad436b65b507f607"
"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"
"checksum schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "0e1a231dc10abf6749cfa5d7767f25888d484201accbd919b66ab5413c502d56"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 67 files
+11 −1 CHANGELOG.md
+1 −1 Cargo.toml
+15 −2 src/cargo/core/compiler/build_config.rs
+21 −1 src/cargo/core/compiler/build_context/mod.rs
+30 −24 src/cargo/core/compiler/context/mod.rs
+7 −0 src/cargo/core/compiler/context/unit_dependencies.rs
+90 −84 src/cargo/core/compiler/custom_build.rs
+11 −5 src/cargo/core/compiler/fingerprint.rs
+2 −2 src/cargo/core/compiler/job_queue.rs
+110 −89 src/cargo/core/compiler/mod.rs
+1 −1 src/cargo/core/compiler/output_depinfo.rs
+1 −0 src/cargo/core/manifest.rs
+101 −86 src/cargo/core/resolver/errors.rs
+0 −1 src/cargo/ops/resolve.rs
+65 −24 src/cargo/util/command_prelude.rs
+2 −21 src/cargo/util/flock.rs
+18 −2 src/doc/man/generated/cargo-bench.html
+18 −2 src/doc/man/generated/cargo-build.html
+18 −2 src/doc/man/generated/cargo-check.html
+18 −2 src/doc/man/generated/cargo-doc.html
+18 −2 src/doc/man/generated/cargo-fix.html
+1 −1 src/doc/man/generated/cargo-metadata.html
+18 −2 src/doc/man/generated/cargo-run.html
+18 −2 src/doc/man/generated/cargo-rustc.html
+18 −2 src/doc/man/generated/cargo-rustdoc.html
+18 −2 src/doc/man/generated/cargo-test.html
+12 −2 src/doc/man/options-message-format.adoc
+45 −5 src/etc/man/cargo-bench.1
+45 −5 src/etc/man/cargo-build.1
+45 −5 src/etc/man/cargo-check.1
+3 −3 src/etc/man/cargo-clean.1
+45 −5 src/etc/man/cargo-doc.1
+3 −3 src/etc/man/cargo-fetch.1
+45 −5 src/etc/man/cargo-fix.1
+3 −3 src/etc/man/cargo-generate-lockfile.1
+3 −3 src/etc/man/cargo-help.1
+3 −3 src/etc/man/cargo-init.1
+3 −3 src/etc/man/cargo-install.1
+3 −3 src/etc/man/cargo-locate-project.1
+3 −3 src/etc/man/cargo-login.1
+3 −3 src/etc/man/cargo-metadata.1
+3 −3 src/etc/man/cargo-new.1
+3 −3 src/etc/man/cargo-owner.1
+3 −3 src/etc/man/cargo-package.1
+3 −3 src/etc/man/cargo-pkgid.1
+3 −3 src/etc/man/cargo-publish.1
+45 −5 src/etc/man/cargo-run.1
+45 −5 src/etc/man/cargo-rustc.1
+45 −5 src/etc/man/cargo-rustdoc.1
+3 −3 src/etc/man/cargo-search.1
+45 −5 src/etc/man/cargo-test.1
+3 −3 src/etc/man/cargo-uninstall.1
+3 −3 src/etc/man/cargo-update.1
+19 −2 src/etc/man/cargo-vendor.1
+3 −3 src/etc/man/cargo-verify-project.1
+3 −3 src/etc/man/cargo-version.1
+3 −3 src/etc/man/cargo-yank.1
+4 −4 src/etc/man/cargo.1
+2 −3 tests/testsuite/build.rs
+20 −16 tests/testsuite/build_script.rs
+0 −2 tests/testsuite/cross_compile.rs
+3 −0 tests/testsuite/features.rs
+1 −1 tests/testsuite/fix.rs
+1 −0 tests/testsuite/main.rs
+126 −0 tests/testsuite/message_format.rs
+49 −0 tests/testsuite/registry.rs
+42 −2 tests/testsuite/rustflags.rs

0 comments on commit db7c773

Please sign in to comment.