Only ensure solutions are in the same file in cargo fix #6402
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Trying this with my local rustc branch doesn't work yet, let me fix it. |
|
Nevermind, ran the wrong cargo binary... This patch works fine.
|
This comment has been minimized.
This comment has been minimized.
killercup
reviewed
Dec 9, 2018
There was a problem hiding this comment.
Looks good. Ideally, we'd add a test here, too, but that is probably blocked on rust-lang/rust#56645
pietroalbini
changed the title
Co-Authored-By: Pascal Hertleif <killercup@gmail.com>
pietroalbini
force-pushed
the
fix-cargofix
branch
from
bb18b2d
to
a9f64b2
Compare
pietroalbini
changed the title
|
Ok, removed the bump to rustfix 0.4.3. This is ready to be reviewed, even though it's not enough on its own for rust-lang/rust#56645 (needs a fix for rust-lang/rust#53934 before I can fix all the |
|
@bors: r+ |
|
📌 Commit a9f64b2 has been approved by |
bors
added a commit
that referenced
this pull request
Dec 10, 2018
Only ensure solutions are in the same file in cargo fix This PR changes `cargo fix` to avoid rejecting machine-applicable lints with multiple suggestions. Instead, now it only checks the solutions are in the same file. I don't know how to write a test for this, since no lint in rustc relies on the new behavior and the existing `cargo fix` tests just invoke lints in rustc. Any idea on that would be appreciated. r? @alexcrichton cc @killercup fixes #6401
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR changes
cargo fixto avoid rejecting machine-applicable lints with multiple suggestions. Instead, now it only checks the solutions are in the same file.I don't know how to write a test for this, since no lint in rustc relies on the new behavior and the existing
cargo fixtests just invoke lints in rustc. Any idea on that would be appreciated.r? @alexcrichton
cc @killercup
fixes #6401