-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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 #84886
Update RLS and Rustfmt #84886
Conversation
Some changes occurred in src/tools/rustfmt. |
(rust-highfive has picked a reviewer for you, use r? to override) |
|
This comment has been minimized.
This comment has been minimized.
@Xanewok Would you consider applying and including rust-lang/rls#1732 in this, please? |
8e2b393
to
cdf8207
Compare
Done :) |
@Xanewok Thanks! |
cdf8207
to
5ad58cd
Compare
I'm confused, Should we approve it and see if this makes it past bors or should we wait for #82208 to land? |
I have no preference on whether to land this or #82208 first; it might be faster to land this though since it's just a routine bump and 82208 still needs review for the bootstrap changes. |
Let's try it then: @bors r+ p=1 |
📌 Commit 5ad58cd059be13728813dab1332795cafbb10ce9 has been approved by |
⌛ Testing commit 5ad58cd059be13728813dab1332795cafbb10ce9 with merge 1439d5a0a3b533108d9399447b5292ffa79ead5d... |
This comment has been minimized.
This comment has been minimized.
💔 Test failed - checks-actions |
Looks like a rustfmt test failure, cc @calebcartwright |
It doesn't seem like we'll add back the support for inner attributes in that context in time before we need to fix the toolstate, correct? Should we ignore these tests for now? |
Yeah I'll remove those snippets from our set of test files; no point keeping around something the parser won't accept and we can always add them back if something changes. I'll patch it in rustfmt here in a little bit |
Have updated rustfmt and opened rust-lang/rls#1734 in RLS to pull in the updates Edit - actually I guess the RLS PR isn't really needed to address things here since it's just tests on the rustfmt side. Let me know/feel free to close that RLS PR if you'd prefer to only update the rustfmt submod |
5ad58cd
to
dcaf74b
Compare
Updated the Rustfmt rev both here and in the RLS (it's nice to migrate to a new version in unison), so let's try again: @bors r+ |
📌 Commit dcaf74b has been approved by |
☀️ Test successful - checks-actions |
📣 Toolstate changed by #84886! Tested on commit 24acc38. 🎉 rls on windows: build-fail → test-pass (cc @Xanewok). |
Tested on commit rust-lang/rust@24acc38. Direct link to PR: <rust-lang/rust#84886> 🎉 rls on windows: build-fail → test-pass (cc @Xanewok). 🎉 rls on linux: build-fail → test-pass (cc @Xanewok). 🎉 rustfmt on windows: build-fail → test-pass (cc @calebcartwright @topecongiro). 🎉 rustfmt on linux: build-fail → test-pass (cc @calebcartwright @topecongiro).
…crum [beta] Prepare beta 1.53.0 Along with updating the channel and updating the bootstrap compiler, this also includes: * 692454d - Fixes the diagnostics difference we had for some cycles already * 9157430 - Disables the known broken RLS builder on AArch64 Windows * rust-lang#84183 - Update RELEASES.md for 1.52.0 * rust-lang#84950 - Revert PR 83866 * rust-lang#84886 - Update RLS and Rustfmt Changes we backported to 1.52.0 that we also need to include in 1.53.0 to avoid regressing: * rust-lang#84867 - rustdoc: revert deref recur to resume inclusion of impl ExtTrait<Local> for ExtType * rust-lang#84759 - [beta] remove assert_matches * rust-lang#83171 - Revert PR 81473 to resolve (on beta) issues 81626 and 81658. r? `@ghost`
Closes #84537. Closes #84538.
I know there's #82208 in progress but I'm not sure which we want to land first.
Also, I'm getting Rustfmt test failures due to inner attributes not permitted:
but let's see what CI says, first.
cc @calebcartwright