Add migration lint for 2024 prelude additions #125889
Merged
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
rustbot
added
S-waiting-on-review
6 tasks
This comment has been minimized.
This comment has been minimized.
Noratrieb
force-pushed
the
migrate-into-the-future
branch
from
26deb13 to
0f46870
Compare
Noratrieb
commented
Jun 2, 2024
traviscross
reviewed
Jun 2, 2024
tests/ui/rust-2024/prelude-migration/into-future-not-into-future.rs
Outdated
Show resolved
Hide resolved
traviscross
reviewed
Jun 2, 2024
Comment on lines
+3875
to
+3791
| pub RUST_2024_PRELUDE_COLLISIONS, | ||
| Allow, | ||
| "detects the usage of trait methods which are ambiguous with traits added to the \ | ||
| prelude in future editions", | ||
| @future_incompatible = FutureIncompatibleInfo { | ||
| reason: FutureIncompatibilityReason::EditionError(Edition::Edition2024), | ||
| reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2024/prelude.html>", | ||
| }; |
There was a problem hiding this comment.
It'd be good to add a test to demonstrate that this is picked up in the rust_2024_compatibility lint group, as in:
|
@rustbot author needs some tweaks, not totally certain if i care if we check for |
rustbot
added
S-waiting-on-author
|
Status here: I want to address the feedback and probably remove the check for the trait impl. I won't get to this for at least another week though, if anyone else wants to pick this up in the meantime, feel free. |
Noratrieb
force-pushed
the
migrate-into-the-future
branch
from
0f46870 to
eca614b
Compare
This comment has been minimized.
This comment has been minimized.
Noratrieb
force-pushed
the
migrate-into-the-future
branch
from
eca614b to
33c3482
Compare
|
@rustbot ready |
rustbot
added
S-waiting-on-review
|
@rustbot author |
rustbot
added
S-waiting-on-author
This adds the migration lint for the newly ambiguous methods `poll` and `into_future`. When these methods are used on types implementing the respective traits, it will be ambiguous in the future, which can lead to hard errors or behavior changes depending on the exact circumstances.
Noratrieb
force-pushed
the
migrate-into-the-future
branch
from
33c3482 to
6f66217
Compare
|
removed the lang item and addresses the rest of the previous feedback: https://github.com/rust-lang/rust/compare/33c3482dac622acb0627ab096ccc633f3f7b21e2..6f662176e7cc5ff81642ca243f50c6b7ed86b8f8 |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 28, 2024
…iaskrgr Rollup of 3 pull requests Successful merges: - rust-lang#125889 (Add migration lint for 2024 prelude additions) - rust-lang#128215 (Update the reference) - rust-lang#128263 (rustdoc: use strategic ThinVec/Box to shrink `clean::ItemKind`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 28, 2024
Rollup merge of rust-lang#125889 - Nilstrieb:migrate-into-the-future, r=compiler-errors Add migration lint for 2024 prelude additions This adds the migration lint for the newly ambiguous methods `poll` and `into_future`. When these methods are used on types implementing the respective traits, it will be ambiguous in the future, which can lead to hard errors or behavior changes depending on the exact circumstances. tracked by rust-lang#121042 <!-- If this PR is related to an unstable feature or an otherwise tracked effort, please link to the relevant tracking issue here. If you don't know of a related tracking issue or there are none, feel free to ignore this. This PR will get automatically assigned to a reviewer. In case you would like a specific user to review your work, you can assign it to them by using r? <reviewer name> --> r? compiler-errors as the method prober
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 adds the migration lint for the newly ambiguous methods
pollandinto_future. When these methods are used on types implementing the respective traits, it will be ambiguous in the future, which can lead to hard errors or behavior changes depending on the exact circumstances.tracked by #121042
r? compiler-errors as the method prober