Skip to content

Commit

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

10 commits in a3c2627fbc2f5391c65ba45ab53b81bf71fa323c..75d5d8cffe3464631f82dcd3c470b78dc1dda8bb
2020-12-14 17:21:26 +0000 to 2020-12-22 18:10:56 +0000
- Update git2 (rust-lang/cargo#9009)
- Stabilize RUSTC_WORKSPACE_WRAPPER (rust-lang/cargo#8976)
- Make cargo metadata and tree respect target (rust-lang/cargo#8987)
- Update git2 (rust-lang/cargo#8998)
- Revert rust-lang/cargo#8954 - changing rustdoc's cwd (rust-lang/cargo#8996)
- With debug HTTP mode log curl's version (rust-lang/cargo#8991)
- Reject ambiguous git dependency declaration. (rust-lang/cargo#8984)
- Fix tests not working with a different CARGO_TARGET_DIR. (rust-lang/cargo#8982)
- Add version to credential dependencies. (rust-lang/cargo#8983)
- Clarify FAQ entry wording about lockfiles (rust-lang/cargo#8978)
  • Loading branch information
@bors
bors committed Dec 24, 2020
2 parents b251612 + 0bfc45a commit 0edce6f
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
21 changes: 11 additions & 10 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -895,9 +895,9 @@ dependencies = [

[[package]]
name = "curl"
version = "0.4.31"
version = "0.4.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9447ad28eee2a5cfb031c329d46bef77487244fff6a724b378885b8691a35f78"
checksum = "e268162af1a5fe89917ae25ba3b0a77c8da752bdc58e7dbb4f15b91fbd33756e"
dependencies = [
"curl-sys",
"libc",
Expand All @@ -910,9 +910,9 @@ dependencies = [

[[package]]
name = "curl-sys"
version = "0.4.34+curl-7.71.1"
version = "0.4.39+curl-7.74.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad4eff0be6985b7e709f64b5a541f700e9ad1407190a29f4884319eb663ed1d6"
checksum = "07a8ce861e7b68a0b394e814d7ee9f1b2750ff8bd10372c6ad3bacc10e86f874"
dependencies = [
"cc",
"libc",
Expand Down Expand Up @@ -1330,9 +1330,9 @@ dependencies = [

[[package]]
name = "git2"
version = "0.13.12"
version = "0.13.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca6f1a0238d7f8f8fd5ee642f4ebac4dbc03e03d1f78fbe7a3ede35dcf7e2224"
checksum = "186dd99cc77576e58344ad614fa9bb27bad9d048f85de3ca850c1f4e8b048260"
dependencies = [
"bitflags",
"libc",
Expand All @@ -1345,9 +1345,9 @@ dependencies = [

[[package]]
name = "git2-curl"
version = "0.14.0"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "502d532a2d06184beb3bc869d4d90236e60934e3382c921b203fa3c33e212bd7"
checksum = "883539cb0ea94bab3f8371a98cd8e937bbe9ee7c044499184aa4c17deb643a50"
dependencies = [
"curl",
"git2",
Expand Down Expand Up @@ -1759,9 +1759,9 @@ dependencies = [

[[package]]
name = "libgit2-sys"
version = "0.12.14+1.1.0"
version = "0.12.16+1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f25af58e6495f7caf2919d08f212de550cfa3ed2f5e744988938ea292b9f549"
checksum = "9f91b2f931ee975a98155195be8cd82d02e8e029d7d793d2bac1b8181ac97020"
dependencies = [
"cc",
"libc",
Expand Down Expand Up @@ -3435,6 +3435,7 @@ dependencies = [
"byteorder",
"crossbeam-utils 0.7.2",
"libc",
"libz-sys",
"proc-macro2",
"quote",
"serde",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 37 files
+3 −3 Cargo.toml
+1 −1 crates/credential/cargo-credential-1password/Cargo.toml
+1 −1 crates/credential/cargo-credential-gnome-secret/Cargo.toml
+1 −1 crates/credential/cargo-credential-macos-keychain/Cargo.toml
+1 −1 crates/credential/cargo-credential-wincred/Cargo.toml
+2 −2 src/cargo/core/compiler/fingerprint.rs
+38 −3 src/cargo/core/compiler/mod.rs
+5 −3 src/cargo/core/compiler/standard_lib.rs
+4 −0 src/cargo/core/package.rs
+2 −14 src/cargo/core/resolver/types.rs
+5 −2 src/cargo/ops/cargo_compile.rs
+6 −4 src/cargo/ops/cargo_doc.rs
+14 −9 src/cargo/ops/cargo_output_metadata.rs
+7 −7 src/cargo/ops/cargo_test.rs
+1 −0 src/cargo/ops/registry.rs
+7 −0 src/cargo/ops/tree/graph.rs
+7 −8 src/cargo/ops/tree/mod.rs
+0 −4 src/cargo/util/config/mod.rs
+2 −2 src/cargo/util/mod.rs
+2 −4 src/cargo/util/toml/mod.rs
+0 −39 src/cargo/util/workspace.rs
+5 −4 src/doc/src/faq.md
+21 −11 src/doc/src/reference/config.md
+8 −0 src/doc/src/reference/environment-variables.md
+5 −4 tests/testsuite/bad_config.rs
+3 −6 tests/testsuite/build.rs
+1 −1 tests/testsuite/build_script.rs
+2 −4 tests/testsuite/cache_messages.rs
+5 −12 tests/testsuite/check.rs
+1 −1 tests/testsuite/cross_compile.rs
+0 −70 tests/testsuite/doc.rs
+1 −11 tests/testsuite/features2.rs
+2 −4 tests/testsuite/fix.rs
+1 −1 tests/testsuite/lto.rs
+50 −0 tests/testsuite/metadata.rs
+1 −1 tests/testsuite/rename_deps.rs
+2 −10 tests/testsuite/standard_lib.rs
2 changes: 2 additions & 0 deletions src/tools/rustc-workspace-hack/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ byteorder = { version = "1", features = ['default', 'std'] }
curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true }
crossbeam-utils = { version = "0.7.2", features = ["nightly"] }
libc = { version = "0.2.79", features = ["align"] }
# Ensure default features of libz-sys, which are disabled in some scenarios.
libz-sys = { version = "1.1.2" }
proc-macro2 = { version = "1", features = ["default"] }
quote = { version = "1", features = ["default"] }
serde = { version = "1.0.82", features = ['derive'] }
Expand Down

0 comments on commit 0edce6f

Please sign in to comment.