Update cargo

[ehuss]

10 commits in a3c2627fbc2f5391c65ba45ab53b81bf71fa323c..75d5d8cffe3464631f82dcd3c470b78dc1dda8bb
2020-12-14 17:21:26 +0000 to 2020-12-22 18:10:56 +0000

• Update git2 (Update git2 cargo#9009)
• Stabilize RUSTC_WORKSPACE_WRAPPER (Stabilize RUSTC_WORKSPACE_WRAPPER cargo#8976)
• Make cargo metadata and tree respect target (Make cargo metadata and tree respect target cargo#8987)
• Update git2 (Update git2 cargo#8998)
• Revert Run rustdoc doctests relative to the workspace cargo#8954 - changing rustdoc's cwd (Revert #8954 - changing rustdoc's cwd cargo#8996)
• With debug HTTP mode log curl's version (With debug HTTP mode log curl's version cargo#8991)
• Reject ambiguous git dependency declaration. (Reject ambiguous git dependency declaration. cargo#8984)
• Fix tests not working with a different CARGO_TARGET_DIR. (Fix tests not working with a different CARGO_TARGET_DIR. cargo#8982)
• Add version to credential dependencies. (Add version to credential dependencies. cargo#8983)
• Clarify FAQ entry wording about lockfiles (Clarify FAQ entry wording about lockfiles cargo#8978)

[rust-highfive]

⚠️ Warning ⚠️

• These commits modify submodules.

[ehuss]

@bors r+

[bors]

📌 Commit d034b665006dfcb587779a19806689599e8b44f1 has been approved by ehuss

[rust-log-analyzer]

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

  SCCACHE_BUCKET: rust-lang-ci-sccache2
  TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate
  CACHE_DOMAIN: ci-caches.rust-lang.org
  EXTRA_VARIABLES: {
 "CI_ONLY_WHEN_SUBMODULES_CHANGED": 1
##[endgroup]
adding extra environment variable CI_ONLY_WHEN_SUBMODULES_CHANGED
linux builder detected, using docker to run the build
##[group]Run src/ci/scripts/should-skip-this.sh
---
   Compiling rustc-ap-rustc_expand v691.0.0
   Compiling rustc-workspace-hack v1.0.0 (/checkout/src/tools/rustc-workspace-hack)
   Compiling rustfmt-nightly v1.4.29 (/checkout/src/tools/rustfmt)
    Finished release [optimized] target(s) in 1m 25s
thread 'main' panicked at 'tools should not compile multiple copies of the same crate', src/bootstrap/tool.rs:196:13
duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:


the following dependencies are duplicated although they have the same features enabled:
the following dependencies have different features:
  libz-sys 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)
    `rustfmt` additionally enabled features {} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/liblibz_sys-24dbd2fa49524ada.rlib"
    `rls` additionally enabled features {"stock-zlib", "default"} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/liblibz_sys-ccddb11a0d4112cb.rlib"

to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set
Build completed unsuccessfully in 0:35:51
    Finished dev [unoptimized + debuginfo] target(s) in 0.18s
    Finished dev [unoptimized + debuginfo] target(s) in 0.18s
error: Tool `rustfmt` was not recorded in tool state.
error: Tool `miri` was not recorded in tool state.
{"rustbook":"test-fail","edition-guide":"test-pass","book":"test-pass","reference":"test-pass","rls":"test-pass","nomicon":"test-pass","rust-by-example":"test-pass","embedded-book":"test-pass"}failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --stage 2 check-tools

[ehuss]

@bors r-

[rust-log-analyzer]

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

  SCCACHE_BUCKET: rust-lang-ci-sccache2
  TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate
  CACHE_DOMAIN: ci-caches.rust-lang.org
  EXTRA_VARIABLES: {
 "CI_ONLY_WHEN_SUBMODULES_CHANGED": 1
##[endgroup]
adding extra environment variable CI_ONLY_WHEN_SUBMODULES_CHANGED
linux builder detected, using docker to run the build
##[group]Run src/ci/scripts/should-skip-this.sh
---
   Compiling rustc-ap-rustc_expand v691.0.0
   Compiling rustc-workspace-hack v1.0.0 (/checkout/src/tools/rustc-workspace-hack)
   Compiling rustfmt-nightly v1.4.29 (/checkout/src/tools/rustfmt)
    Finished release [optimized] target(s) in 1m 28s
thread 'main' panicked at 'tools should not compile multiple copies of the same crate', src/bootstrap/tool.rs:196:13
duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
the following dependencies are duplicated although they have the same features enabled:
the following dependencies have different features:
  libz-sys 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)
    `rustfmt` additionally enabled features {} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/liblibz_sys-24dbd2fa49524ada.rlib"
    `rls` additionally enabled features {"default", "stock-zlib"} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/liblibz_sys-ccddb11a0d4112cb.rlib"

to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set
Build completed unsuccessfully in 0:29:06
    Finished dev [unoptimized + debuginfo] target(s) in 0.16s
    Finished dev [unoptimized + debuginfo] target(s) in 0.16s
error: Tool `rustfmt` was not recorded in tool state.
error: Tool `miri` was not recorded in tool state.
{"nomicon":"test-pass","rust-by-example":"test-pass","edition-guide":"test-pass","book":"test-pass","rls":"test-pass","embedded-book":"test-pass","reference":"test-pass","rustbook":"test-fail"}failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --stage 2 check-tools

[ehuss]

@bors r+

[bors]

📌 Commit 0bfc45a has been approved by ehuss

[ehuss]

@bors p=2
This has several fixes that I'd like to land before beta branch tomorrow, to avoid lots of backports.

[bors]

⌛ Testing commit 0bfc45a with merge 0edce6f...

[bors]

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 0edce6f to master...