Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update cargo #80322

Merged
merged 2 commits into from
Dec 24, 2020
Merged

Update cargo #80322

merged 2 commits into from
Dec 24, 2020

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Dec 23, 2020

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

@ehuss ehuss self-assigned this Dec 23, 2020
@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 23, 2020
@ehuss
Copy link
Contributor Author

ehuss commented Dec 23, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Dec 23, 2020

📌 Commit d034b665006dfcb587779a19806689599e8b44f1 has been approved by ehuss

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 23, 2020
@rust-log-analyzer
Copy link
Collaborator

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
Copy link
Contributor Author

ehuss commented Dec 23, 2020

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 23, 2020
@rust-log-analyzer
Copy link
Collaborator

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
Add libz-sys to rustc-workspace-hack.
0bfc45a 
alexcrichton/curl-rust#351 changed
curl-rust to no longer enable the default features of libz-sys.
Because rustfmt includes rustc-workspace-hack with the
rustc-workspace-hack/all-static feature (sometimes), it ends up building
libz-sys without the default features. This causes a duplicate
with other packages (like rls) which enable the default
features.
@ehuss
Copy link
Contributor Author

ehuss commented Dec 23, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Dec 23, 2020

📌 Commit 0bfc45a has been approved by ehuss

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 23, 2020
@ehuss
Copy link
Contributor Author

ehuss commented Dec 24, 2020

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

@bors
Copy link
Contributor

bors commented Dec 24, 2020

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

@bors
Copy link
Contributor

bors commented Dec 24, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 24, 2020
@bors bors merged commit 0edce6f into rust-lang:master Dec 24, 2020
@rustbot rustbot added this to the 1.50.0 milestone Dec 24, 2020
@ehuss ehuss mentioned this pull request Jan 7, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ehuss ehuss

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.50.0
Development

Successfully merging this pull request may close these issues.
5 participants
@ehuss @rust-highfive @bors @rust-log-analyzer @rustbot