Fix future_prelude_collision false positive#86657
Merged
bors merged 1 commit intorust-lang:masterfrom Jun 29, 2021
Merged
Conversation
Contributor
|
r? @jackh726 (rust-highfive has picked a reviewer for you, use r? to override) |
m-ou-se
approved these changes
Jun 27, 2021
nikomatsakis
approved these changes
Jun 28, 2021
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit bf0da44 has been approved by |
Contributor
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 29, 2021
Rollup of 7 pull requests Successful merges: - rust-lang#86059 (Add new tool to check HTML) - rust-lang#86529 (Add support for OpenSSL 3.0.0) - rust-lang#86657 (Fix `future_prelude_collision` false positive) - rust-lang#86661 (Editon 2021 enables precise capture) - rust-lang#86671 (Turn non_fmt_panic into a future_incompatible edition lint.) - rust-lang#86673 (Make disjoint_capture_migration an edition lint.) - rust-lang#86678 (Fix garbled suggestion for missing lifetime specifier) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Fixes #86633
The lint for checking if method resolution of methods named
try_intowill fail in 2021 edition previously would fire on all inherent methods, however for inherent methods that consumeself, this takes priority overTryInto::try_intodue to being inherent, while trait method and methods that take&selfor&mut selfdon't take priority, and thus aren't affected by this false positive.This fix is rather simple: simply checking if the inherent method doesn't auto-deref or auto-ref (and thus takes
self) and if so, prevents the lint from firing.