Update rustfmt and rls #61861
Merged
Update rustfmt and rls #61861
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
rust-highfive
added
the
S-waiting-on-review
|
@bors: r+ p=1 delegate+ |
|
✌️ @topecongiro can now approve this pull request |
|
📌 Commit 112cf7c6d7d2eca43ea54ff6e6cba4e787f3e61e has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit 112cf7c6d7d2eca43ea54ff6e6cba4e787f3e61e with merge b665e7b5343a66252557c6a2a94991e9e858b760... |
|
💔 Test failed - checks-travis |
bors
added
S-waiting-on-review
|
The job Click to expand the log.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 |
|
No idea where the error comes from or how to fix it... 🙄 |
|
☔ The latest upstream changes (presumably #61771) made this pull request unmergeable. Please resolve the merge conflicts. |
topecongiro
force-pushed
the
rustfmt-1.3.0
branch
from
112cf7c
to
e74786a
Compare
|
The job Click to expand the log.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 |
topecongiro
force-pushed
the
rustfmt-1.3.0
branch
from
e74786a
to
949a49c
Compare
|
The job Click to expand the log.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 |
|
I think the rebase is probably good enough for now to fix the original error, but it looks like new errors are showing up? |
|
Ok, rls has been in test-failing state since 673cf7d (https://rust-lang-nursery.github.io/rust-toolstate/). AFAICT from the log, if a PR is updating one of the submodule that is in test-failing state, then the PR needs to fix that to test-passing. cc @Xanewok EDIT: Now the test on linux is passing but is failing on Windows since 04a3dd8. |
|
Is there any way to work around this for now? I just want to update |
topecongiro
force-pushed
the
rustfmt-1.3.0
branch
from
949a49c
to
f9efa10
Compare
|
Looks like the test state of rls is fixed since 605ea9d so trying again. |
|
@topecongiro please also update RLS to rust-lang/rls@4b13b10 - this ignores a Racer test that started causing spurious failures. |
Update rustfmt to 1.3.0.
topecongiro
force-pushed
the
rustfmt-1.3.0
branch
from
f9efa10
to
5a411a6
Compare
|
📌 Commit 5a411a6 has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jun 19, 2019
…ngiro Update rustfmt and rls This PR bumps the version of rustfmt to 1.3.0.
|
Added to rollup in #61962. |
|
⌛ Testing commit 5a411a6 with merge 52a9c4a0741753e11656df6bfb4383dee4df84f0... |
|
@bors retry |
|
Now let's hope that the highfive spam about changed RLS toolstate will finally be over 😄 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR bumps the version of rustfmt to 1.3.0.