Update RLS and Rustfmt (and Cargo)#50433
Merged
bors merged 1 commit intorust-lang:masterfrom May 4, 2018
Merged
Conversation
Contributor
Member
|
@bors: r+ p=1 |
Collaborator
|
📌 Commit 97c30ce has been approved by |
Member
|
@bors p=4 |
Collaborator
|
🔒 Merge conflict |
Collaborator
|
☔ The latest upstream changes (presumably #50413) made this pull request unmergeable. Please resolve the merge conflicts. |
Member
Author
|
@bors r=alexcrichton p=4 |
Collaborator
|
📌 Commit 4952426 has been approved by |
Collaborator
bors
added a commit
that referenced
this pull request
May 4, 2018
Update RLS and Rustfmt (and Cargo) Updates RLS and Rustfmt (the latter fixing tests). Cargo is updated too (to fix RLS tests), but that is covered by #50417, so probably won't do much. r? @alexcrichton
Collaborator
|
☀️ Test successful - status-appveyor, status-travis |
Member
|
rustfmt is still test-fail, same error as before. |
This file contains hidden or 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
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.
Updates RLS and Rustfmt (the latter fixing tests). Cargo is updated too (to fix RLS tests), but that is covered by #50417, so probably won't do much.
r? @alexcrichton