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.

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

Update RLS and Rustfmt #65311

Closed
wants to merge 1 commit into from
Closed

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented Oct 11, 2019

This also bumps rustc-ap-* crates and fixes the relevant toolstate.

Fixes #65084
Fixes #65085

cc @topecongiro @kngwyu

This also bumps rustc-ap-* crates and fixes the relevant toolstate.
@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@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 Oct 11, 2019
@alexcrichton
Copy link
Member

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Oct 11, 2019

📌 Commit f70d42b has been approved by alexcrichton

@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 Oct 11, 2019
@bors
Copy link
Contributor

bors commented Oct 11, 2019

⌛ Testing commit f70d42b with merge 0c3c9bcac1acc57b6153dc935dc55370096e39fb...

@bors
Copy link
Contributor

bors commented Oct 11, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job dist-x86_64-apple-alt of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-10-11T18:00:21.4929090Z [RUSTC-TIMING] rls test:false 141.086
2019-10-11T18:01:04.7604980Z [RUSTC-TIMING] cargo test:false 258.472
2019-10-11T18:01:08.3829730Z [RUSTC-TIMING] rls test:false 3.586
2019-10-11T18:01:08.4300740Z     Finished release [optimized] target(s) in 7m 31s
2019-10-11T18:01:08.5045630Z 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:
2019-10-11T18:01:08.5045950Z 
2019-10-11T18:01:08.5046760Z the following dependencies are duplicated although they have the same features enabled:
2019-10-11T18:01:08.5047070Z the following dependencies have different features:
2019-10-11T18:01:08.5048510Z   scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)
2019-10-11T18:01:08.5050000Z     `rls` additionally enabled features {"use_std", "default"} at "/Users/vsts/agent/2.158.0/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libscopeguard-fb3bd4a4d7605406.rlib"
2019-10-11T18:01:08.5050930Z     `rustfmt` additionally enabled features {} at "/Users/vsts/agent/2.158.0/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libscopeguard-eff7e7769e630fbe.rlib"
2019-10-11T18:01:08.5051070Z 
2019-10-11T18:01:08.5052190Z 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
2019-10-11T18:01:08.5053100Z thread 'main' panicked at 'tools should not compile multiple copies of the same crate', src/bootstrap/tool.rs:198:13
2019-10-11T18:01:08.5152570Z failed to run: /Users/vsts/agent/2.158.0/work/1/s/build/bootstrap/debug/bootstrap dist
2019-10-11T18:01:08.5152830Z Build completed unsuccessfully in 1:27:04
2019-10-11T18:01:08.5236930Z == clock drift check ==
2019-10-11T18:01:08.5311050Z   local time: Fri Oct 11 18:01:08 UTC 2019
2019-10-11T18:01:08.5311050Z   local time: Fri Oct 11 18:01:08 UTC 2019
2019-10-11T18:01:08.6201750Z   network time: Fri, 11 Oct 2019 18:01:08 GMT
2019-10-11T18:01:08.6204400Z == end clock drift check ==
2019-10-11T18:01:08.6447970Z ##[error]Bash exited with code '1'.
2019-10-11T18:01:08.6500260Z ##[section]Starting: Upload CPU usage statistics
2019-10-11T18:01:08.6541040Z ==============================================================================
2019-10-11T18:01:08.6541170Z Task         : Bash
2019-10-11T18:01:08.6541260Z Description  : Run a Bash script on macOS, Linux, or Windows

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 11, 2019
@mati865
Copy link
Contributor

mati865 commented Oct 11, 2019

I believe brson/home#15 should fix error from #65311 (comment).

In meantime you could patch workspace hack.

@tesuji
Copy link
Contributor

tesuji commented Oct 11, 2019

Published https://crates.io/crates/home/0.5.1

@tesuji tesuji mentioned this pull request Oct 12, 2019
@Xanewok
Copy link
Member Author

Xanewok commented Oct 12, 2019

Closing in favor of #65328

@Xanewok Xanewok closed this Oct 12, 2019
@Xanewok Xanewok deleted the update-tools branch October 12, 2019 16:27
bors added a commit that referenced this pull request Oct 12, 2019
Update rls and rustfmt

cc @Xanewok

Fixes #65084
Fixes #65085
Suppressed  #65311
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rustfmt no longer builds after rust-lang/rust#65076 rls no longer builds after rust-lang/rust#65076
6 participants