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 #47051

Merged
merged 2 commits into from
Dec 29, 2017
Merged

Update RLS and Rustfmt #47051

merged 2 commits into from
Dec 29, 2017

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented Dec 28, 2017

Essentially #46929 with only RLS update that fixes the build.

The rls wasn't included in the recent nightlies and a lot of people have been wondering what to do about it, so it'd be good to include the RLS back with the nightly builds as soon as we can.

r? @alexcrichton

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 28, 2017
@kennytm
Copy link
Member

kennytm commented Dec 28, 2017

Should this update rustfmt as well?

@Xanewok
Copy link
Member Author

Xanewok commented Dec 28, 2017

I wanted to err on the safe side and update only RLS, mostly to fix the build issues.
@nrc Should I also update rustfmt and toolstate.toml?

@Xanewok
Copy link
Member Author

Xanewok commented Dec 28, 2017

@kennytm how does the new https://github.com/rust-lang-nursery/rust-toolstate work? Does it automatically detect touched tools in the tree and publishes appropriate toolstate if it compiles/tests pass?

@Xanewok
Copy link
Member Author

Xanewok commented Dec 29, 2017

Updated rustfmt submodule to rustfmt@0.3.4, which is the version that updated RLS uses.

@Xanewok Xanewok changed the title Update RLS Update RLS and Rustfmt Dec 29, 2017
@kennytm
Copy link
Member

kennytm commented Dec 29, 2017

@Xanewok Yes it automatically detects if the tools can be built and tested. If the state changed, the CI will send a commit to update the webpage.

Unfortunately if the update failed you need to send another PR to correct it 🤔

@kennytm
Copy link
Member

kennytm commented Dec 29, 2017

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Dec 29, 2017

📌 Commit 5081b94 has been approved by kennytm

@bors
Copy link
Contributor

bors commented Dec 29, 2017

⌛ Testing commit 5081b94 with merge f0e5c95...

bors added a commit that referenced this pull request Dec 29, 2017
Update RLS and Rustfmt

Essentially #46929 with only RLS update that fixes the build.

The rls wasn't included in the recent nightlies and a lot of people have been wondering what to do about it, so it'd be good to include the RLS back with the nightly builds as soon as we can.

r? @alexcrichton
@kennytm kennytm 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 29, 2017
@bors
Copy link
Contributor

bors commented Dec 29, 2017

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

@bors bors merged commit 5081b94 into rust-lang:master Dec 29, 2017
kennytm-githubbot added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Dec 29, 2017
Tested on commit rust-lang/rust@f0e5c95.

🎉 rls on windows: build-fail → test-pass.
🎉 rls on linux: build-fail → test-pass.
🎉 rustfmt on windows: build-fail → test-pass.
🎉 rustfmt on linux: build-fail → test-pass.
@Xanewok Xanewok deleted the update-rls branch January 3, 2018 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants