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

Rustfix update #86210

Merged
merged 3 commits into from
Jun 21, 2021
Merged

Rustfix update #86210

merged 3 commits into from
Jun 21, 2021

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jun 11, 2021

This updates to rustfix 0.6.0. One of the key changes here is rust-lang/rustfix#195 which changes rustfix to apply multi-part suggestions. One of the tests needs to updated because there are some overlapping suggestions which rustfix cannot handle. The solution is to only apply the machine-applicable suggestions to avoid the overlapping issue.

This also includes a minor change to compiletest to provide better error messages with rustfix.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 11, 2021
@bors
Copy link
Contributor

bors commented Jun 13, 2021

☔ The latest upstream changes (presumably #86207) made this pull request unmergeable. Please resolve the merge conflicts.

@Mark-Simulacrum
Copy link
Member

Hm, am I correct that the changes in this PR have no bearing on the rustfix users observe in use? That comes from cargo, and is not being updated here, right?

It seems like our compiletest should use the same version as users will see -- I'm surprised to see only one get updated here. Maybe it makes sense to add a tidy check or otherwise assert the two are the same?

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 20, 2021
@ehuss
Copy link
Contributor Author

ehuss commented Jun 20, 2021

Yea, this is only for running compiletest tests.

The reason this is separate is because #86207 needed to be merged to unblock another PR, and there was some desire to unblock it before beta branched. I didn't want to make the PR wait for these updates to get reviewed and merged.

I went ahead and added a small check to tidy. rustfix semver-incompatible changes only happen once every few years, so it's not too common. The tidy check can be removed if it is a problem.

@Mark-Simulacrum
Copy link
Member

Sounds good, thanks for adding the tidy check. @bors r+

@bors
Copy link
Contributor

bors commented Jun 21, 2021

📌 Commit 35bf1be has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 21, 2021
@bors
Copy link
Contributor

bors commented Jun 21, 2021

⌛ Testing commit 35bf1be with merge 6a5b97a...

@bors
Copy link
Contributor

bors commented Jun 21, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 6a5b97a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 21, 2021
@bors bors merged commit 6a5b97a into rust-lang:master Jun 21, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jun 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants