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

tools: Fix rustfmt and the RLS #45811

Merged
merged 1 commit into from
Nov 6, 2017
Merged

tools: Fix rustfmt and the RLS #45811

merged 1 commit into from
Nov 6, 2017

Conversation

DSpeckhals
Copy link
Contributor

These tools have been corrected in their upstream repo's, and the submodules have been updated here to reflect that. I also had to update Cargo to match what the RLS is expecting.

The tool states for rustfmt and rls where both changed from "Broken" to "Testing" in this commit, thus enabling testing and distribution again.

These tools have been corrected in their upstream repo's, and the
submodules have been updated here to reflect that. I also had to update
Cargo to match what the RLS is expecting.

The tool states for `rustfmt` and `rls` where both changed from "Broken"
to "Testing" in this commit, thus enabling testing and distribution
again.
@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@nikomatsakis
Copy link
Contributor

@bors r+ p=1

Seems like it'd be good to get this landed.

@bors
Copy link
Contributor

bors commented Nov 6, 2017

📌 Commit d0c1f36 has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Nov 6, 2017

⌛ Testing commit d0c1f36 with merge bd0e45a...

bors added a commit that referenced this pull request Nov 6, 2017
tools: Fix rustfmt and the RLS

These tools have been corrected in their upstream repo's, and the submodules have been updated here to reflect that. I also had to update Cargo to match what the RLS is expecting.

The tool states for `rustfmt` and `rls` where both changed from "Broken" to "Testing" in this commit, thus enabling testing and distribution again.
@bors
Copy link
Contributor

bors commented Nov 6, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing bd0e45a to master...

@bors bors merged commit d0c1f36 into rust-lang:master Nov 6, 2017
@bors bors mentioned this pull request Nov 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants