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 Rustfmt and RLS #56666

Merged
merged 4 commits into from
Dec 10, 2018
Merged

Update Rustfmt and RLS #56666

merged 4 commits into from
Dec 10, 2018

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented Dec 10, 2018

Supersedes #56652, hopefully fixes toolstate.

r? @SimonSapin

@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 10, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools of your PR failed on Travis (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.
travis_time:end:0295a60a:start=1544429469773414786,finish=1544429470901596774,duration=1128181988
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-tools
---
[01:20:54]    Compiling rustc-ap-rustc_target v306.0.0
[01:20:54]    Compiling rustc-ap-syntax_pos v306.0.0
[01:21:07]    Compiling rustc-ap-rustc_errors v306.0.0
[01:21:26]    Compiling rustc-ap-syntax v306.0.0
[01:24:25] error[E0433]: failed to resolve: could not find `AsFail` in `failure`
[01:24:25]   --> src/tools/rustfmt/src/format-diff/main.rs:39:10
[01:24:25]    |
[01:24:25] 39 | #[derive(Fail, Debug)]
[01:24:25]    |          ^^^^ could not find `AsFail` in `failure`
[01:24:25] error: aborting due to previous error
[01:24:25] 
[01:24:25] For more information about this error, try `rustc --explain E0433`.
[01:24:25] error: Could not compile `rustfmt-nightly`.
---
[01:26:08] This PR updated 'src/tools/rustfmt', verifying if status is 'test-pass'...
[01:26:08] 
[01:26:08] ⚠️ We detected that this PR updated 'rustfmt', but its tests failed.
[01:26:08] 
[01:26:08] If you do intend to update 'rustfmt', please check the error messages above and
[01:26:08] commit another update.
[01:26:08] 
[01:26:08] If you do NOT intend to update 'rustfmt', please ensure you did not accidentally
[01:26:08] change t-linux-gnu/stage0-codegen/x86_64-unknown-linux-gnu/release
214760 ./obj/build/x86_64-unknown-linux-gnu/stage0-codegen/x86_64-unknown-linux-gnu/release/deps
210876 ./src/llvm-emscripten/test
204532 ./obj/build/x86_64-unknown-linux-gnu/stage1
204512 ./obj/build/x86_64-unknown-linux-gnu/stage1/lib
---
137492 ./obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps
134420 ./.git/modules
134416 ./.git/modules/src
133856 ./obj/build/bootstrap/debug/incremental/bootstrap-2sokbknxy3png
133852 ./obj/build/bootstrap/debug/incremental/bootstrap-2sokbknxy3png/s-f7gd5f0xvg-1qd9e0u-l8salou8bz1b
115356 ./src/llvm/test/CodeGen
111060 ./obj/build/x86_64-unknown-linux-gnu/stage2-tools/release/deps
107888 ./obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends
107416 ./src/tools/lldb

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)

We use failure_derive 0.1.3, try to work around
```
error[E0433]: failed to resolve: could not find `AsFail` in `failure`
```
@SimonSapin
Copy link
Contributor

r? @alexcrichton

@kennytm
Copy link
Member

kennytm commented Dec 10, 2018

@bors r+ p=2

@bors
Copy link
Contributor

bors commented Dec 10, 2018

📌 Commit 4ceed86 has been approved by kennytm

@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 10, 2018
@bors
Copy link
Contributor

bors commented Dec 10, 2018

⌛ Testing commit 4ceed86 with merge 1137d29...

bors added a commit that referenced this pull request Dec 10, 2018
Update Rustfmt and RLS

Supersedes #56652, hopefully fixes toolstate.

r? @SimonSapin
@bors
Copy link
Contributor

bors commented Dec 10, 2018

💥 Test timed out

@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 Dec 10, 2018
@alexcrichton
Copy link
Member

This passed on both so I'm going to merge manually, assuming a CI glitch:

@alexcrichton alexcrichton merged commit 4ceed86 into rust-lang:master Dec 10, 2018
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #56666!

Tested on commit 1137d29.
Direct link to PR: #56666

🎉 rls on windows: build-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).
🎉 rustfmt on windows: build-fail → test-pass (cc @nrc, @rust-lang/infra).
🎉 rustfmt on linux: build-fail → test-pass (cc @nrc, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Dec 10, 2018
Tested on commit rust-lang/rust@1137d29.
Direct link to PR: <rust-lang/rust#56666>

🎉 rls on windows: build-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-pass (cc @nrc @Xanewok, @rust-lang/infra).
🎉 rustfmt on windows: build-fail → test-pass (cc @nrc, @rust-lang/infra).
🎉 rustfmt on linux: build-fail → test-pass (cc @nrc, @rust-lang/infra).
@Xanewok Xanewok deleted the rustfmt branch December 10, 2018 18:47
This was referenced Dec 10, 2018
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.

6 participants