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

Sync with rustc_span changes #4829

Merged
merged 4 commits into from
May 13, 2021
Merged

Sync with rustc_span changes #4829

merged 4 commits into from
May 13, 2021

Conversation

cbeuw
Copy link
Contributor

@cbeuw cbeuw commented May 4, 2021

rust-lang/rust#83813 made some changes to SourceMap and RealFileName which need to be reflected here once they land in nightly

Closes - after updating rustfmt submodule - rust-lang/rust#85226

@cbeuw
Copy link
Contributor Author

cbeuw commented May 4, 2021

Ok these should be all the changes needed (plus updating rust-toolchain to the right nightly version) once rust-lang/rust#83813 lands in nightly

@calebcartwright calebcartwright marked this pull request as ready for review May 12, 2021 22:11
@calebcartwright calebcartwright changed the title [DO NOT MERGE YET] Sync with rustc_span changes Sync with rustc_span changes May 12, 2021
@calebcartwright calebcartwright self-requested a review May 12, 2021 22:12
@cbeuw
Copy link
Contributor Author

cbeuw commented May 12, 2021

@calebcartwright Thanks for reviewing this. I bumped the version to the new nightly but it hasn't been released yet so we'll have to wait a bit for the tests to pass

@calebcartwright
Copy link
Member

@calebcartwright Thanks for reviewing this. I bumped the version to the new nightly but it hasn't been released yet so we'll have to wait a bit for the tests to pass

Sorry, jumped a little early on this will check back in another few hours once the next nightly drops. Thank you for the PR over here by the way, very helpful!

Copy link
Member

@calebcartwright calebcartwright left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@calebcartwright calebcartwright merged commit 927561a into rust-lang:master May 13, 2021
@cbeuw cbeuw deleted the 83813 branch May 13, 2021 06:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants