Make sure we consume a generic arg when checking mistyped turbofish #124930
+25
−1
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 has assigned @petrochenkov. Use |
rustbot
added
S-waiting-on-review
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 11, 2024
Rollup of 5 pull requests Successful merges: - rust-lang#124233 (Add `-lmingwex` second time in `mingw_libs`) - rust-lang#124318 (ignore generics args in attribute paths) - rust-lang#124899 (bootstrap: add comments for the automatic dry run) - rust-lang#124904 (reachable computation: extend explanation of what this does, and why) - rust-lang#124930 (Make sure we consume a generic arg when checking mistyped turbofish) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 11, 2024
Rollup merge of rust-lang#124930 - compiler-errors:consume-arg, r=petrochenkov Make sure we consume a generic arg when checking mistyped turbofish When recovering un-turbofish-ed args in expr position (e.g. `let x = a<T, U>();` in `check_mistyped_turbofish_with_multiple_type_params`, we used `parse_seq_to_before_end` to parse the fake generic args; however, it used `parse_generic_arg` which *optionally* parses a generic arg. If it doesn't end up parsing an arg, it returns `Ok(None)` and consumes no tokens. If we don't find a delimiter after this (`,`), we try parsing *another* element. In this case, we just infinitely loop looking for a subsequent element. We can fix this by making sure that we either parse a generic arg or error in `parse_seq_to_before_end`'s callback. Fixes rust-lang#124897
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.
When recovering un-turbofish-ed args in expr position (e.g.
let x = a<T, U>();incheck_mistyped_turbofish_with_multiple_type_params, we usedparse_seq_to_before_endto parse the fake generic args; however, it usedparse_generic_argwhich optionally parses a generic arg. If it doesn't end up parsing an arg, it returnsOk(None)and consumes no tokens. If we don't find a delimiter after this (,), we try parsing another element. In this case, we just infinitely loop looking for a subsequent element.We can fix this by making sure that we either parse a generic arg or error in
parse_seq_to_before_end's callback.Fixes #124897