-
Notifications
You must be signed in to change notification settings - Fork 256
Conversation
Edit: This is now blocked on rustfmt supporting edition 2021: rust-lang/rustfmt#4618 + rust-lang/rustfmt#4623 |
Have started the next step in the rustc-ap dance over in racer (racer-rust/racer#1151). Will update here once the corresponding racer and rustfmt deps can be updated here |
Thanks! This still needs Rustfmt and Racer bump, correct? @bors delegate+ |
✌️ @m-ou-se can now approve this pull request |
Correct. Little bit of a hiccup on the rustfmt side though that's likely going to delay this. |
For awareness, one of the changes upstream in rustc is that redundant semicolons on items in the statement position are now parsed as two separate statements instead of a single statement that contains the trailing semi in the statement span of the item. This issue didn't surface in rust-lang/rustfmt#4618 against the rustfmt master branch because that branch contains breaking changes we'd like to one day release, one of which includes the elision of these redundant semis. While I'd love to be able to go ahead and do the same in distributed rustfmt versions, I can't because doing so would violate our stability guarantee. I've largely resolved the bulk of this, but debating with myself how much more effort I'm willing to put into maintaining current formatting for cases that have comments between the end of the item and the redundant semi with these upstream rustc changes. |
Hm, that is unfortunate indeed. Thanks for shedding some light on the context? Is there anything I can do to help you/unburden you somehow? |
Thanks for the offer! Have gotten this sorted though, rustfmt can be picked up from the rustfmt-1.4.31 branch now |
Great, thanks! This looks like it needs a toml bump and a Racer bump to pull a single v697 version of rustc-ap-* crates. @m-ou-se could you do that or should I do it in a follow-up? |
Done :) |
Awesome, thank you so much! @bors r+ |
📌 Commit 956c2e2 has been approved by |
☀️ Test successful - checks-actions |
See rust-lang/rust#80576. This un-breaks the build of RLS after rust-lang/rust#79576 broke it.