Skip to content
This repository has been archived by the owner on Nov 24, 2023. It is now read-only.

Revert revert multiple suggestions fix #195

Merged

Conversation

m-ou-se
Copy link
Member

@m-ou-se m-ou-se commented May 31, 2021

This re-applies #155, as proposed in rust-lang/rust#53934 (comment).

@Manishearth Manishearth merged commit fa2cd29 into rust-lang:master Jun 1, 2021
@m-ou-se m-ou-se deleted the revert-revert-multiple-suggestions branch June 1, 2021 15:49
@ehuss
Copy link
Collaborator

ehuss commented Jun 7, 2021

Can someone publish a new version? Maybe @killercup?

@killercup
Copy link
Member

killercup commented Jun 9, 2021

Sorry, I'm on vacation and didn't see the ping. I'm publishing all the latest changes as 0.6.0.

Update:

bors added a commit to rust-lang/cargo that referenced this pull request Jun 10, 2021
Update rustfix.

This updates rustfix to 0.6.0. There are a few changes since 0.5.0, the following are noticeable changes:

* rust-lang/rustfix#185 — Fix some panics in edge cases.
* rust-lang/rustfix#195 — Revert revert multiple suggestions fix

The important one is rust-lang/rustfix#195 which is necessary to handle some 2021 edition migration support. I have added a test to check that it works correctly.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 21, 2021
Rustfix update

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.
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.

5 participants