-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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 and Cargo #46929
Conversation
(rust_highfive has picked a reviewer for you, use r? to override) |
@bors: r=me p=1 |
@bors: r+ p=1 |
📌 Commit 85adcea has been approved by |
@bors: r+ p=1 |
📌 Commit 4743f0a has been approved by |
@nrc with rust-lang/rls#635 mind if I throw that plus the cargo update in here as well? |
@alexcrichton sure! I can do that - I still have the branch ready |
@bors: r+ p=1 |
📌 Commit f742a64 has been approved by |
I pushed an extra commit to update the git2 binding as well, but feel free to squash it away if something else on this branch changes @bors: r=nrc |
📌 Commit 3a1805a has been approved by |
⌛ Testing commit 3a1805a7d2151029e8ead6c92082876cbf9fbe7c with merge e60ba040a4ff947d490cf8d572146c8c3743c3b5... |
💔 Test failed - status-appveyor |
@bors: retry |
@bors r- I'm pretty sure the errors are legit. The failing test cases are:
|
I think rust-lang/cargo#4856 should fix that issue |
@bors: r=nrc |
📌 Commit 0f83031 has been approved by |
⌛ Testing commit 0f83031 with merge 2a3a73167e117eebb831c77276ddee714cbe2521... |
💔 Test failed - status-travis |
rustfmt is still broken.
|
Rustfmt has been broken again, to be precise :-( |
rustfmt is fixed on 0.3.4. |
@nrc @alexcrichton that'd be my fault. I didn't push a PR to cargo to fix it because I didn't realize the new field had landed in rustc yet. |
☔ The latest upstream changes (presumably #46630) made this pull request unmergeable. Please resolve the merge conflicts. |
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
No description provided.