Skip to content
This repository has been archived by the owner on Dec 29, 2022. It is now read-only.

Add edition 2021. #1709

Merged
merged 4 commits into from
Jan 10, 2021
Merged

Add edition 2021. #1709

merged 4 commits into from
Jan 10, 2021

Conversation

m-ou-se
Copy link
Member

@m-ou-se m-ou-se commented Jan 1, 2021

See rust-lang/rust#80576. This un-breaks the build of RLS after rust-lang/rust#79576 broke it.

@m-ou-se
Copy link
Member Author

m-ou-se commented Jan 1, 2021

The build fails because the 2021 edition hasn't landed in a nightly rust release yet.

Edit: This is now blocked on rustfmt supporting edition 2021: rust-lang/rustfmt#4618 + rust-lang/rustfmt#4623

@calebcartwright
Copy link
Member

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

@Xanewok
Copy link
Member

Xanewok commented Jan 3, 2021

Thanks! This still needs Rustfmt and Racer bump, correct?

@bors delegate+

@bors
Copy link
Contributor

bors commented Jan 3, 2021

✌️ @m-ou-se can now approve this pull request

@calebcartwright
Copy link
Member

This still needs Rustfmt and Racer bump, correct?

Correct. Little bit of a hiccup on the rustfmt side though that's likely going to delay this.

@calebcartwright
Copy link
Member

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.

@Xanewok
Copy link
Member

Xanewok commented Jan 8, 2021

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?

@calebcartwright
Copy link
Member

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

@Xanewok
Copy link
Member

Xanewok commented Jan 10, 2021

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?

@m-ou-se
Copy link
Member Author

m-ou-se commented Jan 10, 2021

Done :)

@Xanewok
Copy link
Member

Xanewok commented Jan 10, 2021

Awesome, thank you so much!

@bors r+

@bors
Copy link
Contributor

bors commented Jan 10, 2021

📌 Commit 956c2e2 has been approved by Xanewok

@bors
Copy link
Contributor

bors commented Jan 10, 2021

⌛ Testing commit 956c2e2 with merge 288260a...

@bors
Copy link
Contributor

bors commented Jan 10, 2021

☀️ Test successful - checks-actions
Approved by: Xanewok
Pushing 288260a to master...

@bors bors merged commit 288260a into rust-lang:master Jan 10, 2021
@m-ou-se m-ou-se deleted the 2021 branch January 14, 2021 16:19
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants